Commit Graph

8562 Commits

Author SHA1 Message Date
Skilets
e938b2f9ed Icon (#426)
* Fix Hud

* skulls wall

---------

Co-authored-by: SkiletsKir <113713080+Skilets@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-08-28 15:32:22 +03:00
Ed
aa5f9104df Wallpaper (#424)
* wallpaper system

* fix startup ordering

* cool doAfters

* green test wallpapers

* wallpaper finite stacks

* dev update

* Update CP14ClientWallpaperSystem.cs

* fix wall rotations

* yippee

* Update battle_royale.yml

* Update test-ship.yml
2024-08-28 15:11:32 +03:00
Ed
a944cd9834 Cloth pack (#423)
* content

* Update battle_royale_temp.yml
2024-08-27 08:58:58 +05:00
Ed
79515d9303 Convenient Z-Levels (#421)
* clear ores and herbals frmo generation

* remake simple zlevels system

* GetMapOffset

* woohoo

* autolink between zlevels

* 5am

* somwthing sommetinh work

* Update CP14StationZLevelsSystem.cs

* fix biomespawner portal deletion

* some docs

* Revert "clear ores and herbals frmo generation"

This reverts commit 658d15a602.
2024-08-25 17:53:15 +03:00
Ed
ea9c6ee7bf PlantFix (#419)
* fix

* Update wheat.yml

* Update CP14FarmingSystem.Interactions.cs
2024-08-23 00:42:27 +03:00
Ed
d3189b83cf Pumpkin + Cabbage (#417)
* seeds

* import Omsoyk plant sprites

* cabbage slicing

* sliceable pumpkin

* some tweaks

* seedbed clean fix, remove shitcode systems

* seed crafting, knife fix

* utencil

* Update base.yml

* cabbage rebalance

* abstract seed
2024-08-22 17:35:00 +03:00
Ed
9c59dab6a2 Merge branch 'ed-19-08-2024-upstream' of https://github.com/crystallpunk-14/crystall-punk-14 into ed-19-08-2024-upstream 2024-08-21 14:33:46 +03:00
Ed
5c4b7a87aa fuck 2024-08-21 14:19:44 +03:00
Ed
2383db6a22 d 2024-08-20 22:52:25 +03:00
Ed
cfeb5fae80 Update secret_weights.yml 2024-08-19 19:16:49 +03:00
Ed
53a9eb259e some ignoring 2024-08-19 19:07:09 +03:00
Ed
c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
2024-08-19 19:06:38 +03:00
Tornado Tech
f6d81c04c0 Added world sprite system (#397)
* Added world sprite system

* Added important comment
2024-08-19 18:41:56 +03:00
Nim
34f90f1bce clothing and armour package (#408)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-08-19 18:41:35 +03:00
lzk
fc33df0e49 give guides for antags (#31208)
* give sleeper traitor default traitor guidebook

* guidebook for thief
2024-08-19 17:40:34 +02:00
Ed
4cb93fc965 Food update (#412)
* meat refactor

* document and remove verb

* cooking table

* cutlets

* dough and cheese update

* flat dough

* size edit, egg added

* Update test-ship.yml

* meat and cheese randomsprite
2024-08-19 18:39:47 +03:00
slarticodefast
05efea3118 quick shuttle wall test fix (#31206)
* quick shuttle wall fix

* this time for real
2024-08-19 17:38:25 +02:00
c4llv07e
df6dbd2ac7 Add reaction randomization. (#308)
* Add random products datafield to the reaciton prototype.

One of the items in the list will be used as additional products as a
result of the reaction and will be persistent per round.

Resolves #245

* Another try

Add getter and setter for the reaction products field and
add random products there.

* There is no such product as CP14BasicEffectHealHeat

* Try to visualize random products in the guidebook

* experimental recipes

* fix

* file restructurization

* Guidebook alchemy update

* Update Alchemy.xml

* fix

* Update mixing_simple.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-08-19 18:04:12 +03:00
tosatur
8eb4e4fa2d added a few chatsan entries (#31085)
* added a few chatsan entries

* added 2 more

* added 4 more and fixed errors

* fixed error again

* added allg

* removed fullstops
2024-08-20 00:03:07 +10:00
SlamBamActionman
84e5565918 Fix shuttle walls rusting when initialized on station grid (#31162)
* Initial commit

* Also reinforced
2024-08-19 15:43:31 +02:00
Ed
055dfe6f0b No pacifist or blind sec (#30777)
* no pacifist sec

* also block blindness

* Update warden.yml

* Update security_officer.yml

* Update head_of_security.yml

* Update security_cadet.yml

* Update detective.yml
2024-08-19 14:42:55 +03:00
Boaz1111
2f923d88e4 New head of security weapon:Energy Shotgun (#30643)
* Reset hopefully?

* removes the emergency security orders

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Rewrites the description based on review

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>

* 7 shots, recharge taking 42 seconds

* minor renaming :godo:

* please work

* Revert "please work"

This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.

* please fix

---------

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
2024-08-19 21:14:30 +10:00
beck-thompson
d297852ba8 Seed vend restock price increase (Fix test fails) (#31185)
First commit
2024-08-19 12:33:41 +02:00
lzk
c3f42438f2 Cheese tweaks (#31168)
* Cheese tweaks

* 22221241256247849`
2024-08-19 10:54:34 +03:00
Nemanja
476c7751c4 Recycler Overhaul (#30802)
* Recycler overhaul

* remove
2024-08-18 21:39:00 -06:00
Flareguy
94c746abe9 Minor vox customization update: new hairstyles & facial hair (#30815)
* new vox customization stuff

* tests fix
2024-08-18 21:32:15 -06:00
Plykiya
7ba049be25 Convert bookshelves from StorageFill to EntityTables (#30895)
* Convert bookshelves to EntityTables

* the fixy

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-18 21:29:52 -06:00
Nemanja
18c146cc7f increase material prices (#30869)
* increase material prices

* ack
2024-08-18 21:28:46 -06:00
Brandon Hu
dd36c85b61 add(AdminGhost): Add a multitool to the admin ghost backpack (#31002) 2024-08-18 21:22:10 -06:00
TheWaffleJesus
1c29310faf ERT chaplains can now use bibles (#30993)
ert chaplains can now use bibles
2024-08-18 21:19:19 -06:00
UBlueberry
2577eb10fd Guidebook updates for Antagonist entries (#31075)
* main antag page + minor antags

* nuuk operatives (greenland)

* "coup d'flop" = "flukies" but for revs

* manifest edgelord

* traitor tot (potato)

* they're coming to get you, barbara

* general changes. posters.

* tfw last minute commit

* traitoration rewritification

* created thieves.xml

* thieves, wow!!
2024-08-18 21:16:05 -06:00
Zachary Yona
f272097e07 Device-list limiting (#30997)
* PDA can no longer be linked to multitool

* Ignore previous commit, it would've broken things

* Added SavableAddress field to DeviceNetwork component and PDA for testing. Still need to implement

* System works, borg and pda addresses cannot be saved, but they still connect to the net.

* Suit sensors can no longer be added to network configurators, still work for monitoring purposes.

---------

Co-authored-by: Zachary Yona <magicalusf@gmail.com>
2024-08-18 21:13:03 -06:00
Boaz1111
ed3e10741f New Projectile Effect:Temperature Change (#31004)
* bah

* all done, thanks slarti

* makes the watcher do the thing

* Update TemperatureSystem.cs

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* changes something

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-08-18 21:11:17 -06:00
to4no_fix
171884df8f Tweaking things that restrict freedom (#31095)
* Adding a straitjacket production recipe

* Adding unequipDelay and equipDelay to the muzzle

* Adding unequipDelay and equipDelay to the blindfold

* Sorting recipes
2024-08-18 21:05:25 -06:00
Nemanja
0a05ee9a27 add space carp and sharkminnow teeth (#31070) 2024-08-18 21:04:59 -06:00
Milon
3e15e00af5 fix admin pda health analyzer popup (#31097)
* damn it

* whoopsie

* no more fucky wucky fucky wuckies are GONE
2024-08-18 21:02:18 -06:00
Moomoobeef
529e4b767c Added a pitcher for the chef to use in serving beverages (#31105)
* changed weird red pixel on pitcher sprite

* added pitcher prototype

* added pitcher to dinnervend

* realized I need to change the other icon sprites too :P
2024-08-18 21:01:26 -06:00
Red Mushie
9240786b53 Fix news management console access checks (#31160)
* Fix news management console access checks using manifest instead of AccessReader component

* Fix one tiny mistake

* Fix one tiny mistake, properly this time

* Revert accidental changes unrelated to this PR

* Add missing .Owner on delete check
2024-08-18 20:55:43 -06:00
Goldminermac
864956c66b Pancakes Fix (#31123)
* Edited blueberry pancake textures to seem more blueberry-stained

* Added new blueberry pancake sprites to allow stacking up to 9

* Added more sprites for chocolate pancakes so they can stack up to 9

* Fixed up the blueberry pancake sprites to be more consistent

* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.

* Updates the stack size in the consumable stacks yaml file.

* Added the new pancake sprites to the sprite meta json file.

* Removed an unnecessary space from the baked food YAML file

* Updated branch and fully resolved merge conflict

* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive

* Diversified the textures some more for good measure.

* Fixed some missing rims around the pancakes because I'm bored
2024-08-18 20:42:58 -06:00
Nemanja
d9e0681a70 make ore indestructible (#31182) 2024-08-18 19:55:49 -06:00
Psychpsyo
9a68cf0b0e Re-add improved random sentience event (#29123)
* Re-add improved random sentience event

* Make randomly sentient PDA more likely

* Make vending machine sentience less likely

* Make requested changes

* Make randomly sentient captain's gear more likely

* Sentient captain sabre has pirate accent

* Tweak new random sentient object a bit more

* Sentient PDA improvements

* Apply recommended fixes

* Add requested changes

* Fix merge conflict
2024-08-18 17:41:12 -06:00
geraeumig
c48a96ac15 Trim punctuation marks in the chat emote system (#28612)
Co-authored-by: geraeumig <alfenos@proton.me>
2024-08-18 16:49:07 -06:00
deltanedas
ad691931c6 add memory cell and rework logic construction (#24983)
* rework construction to be deconstructable, add memory cell

* update textures

* add code

* add memory cell and ports, empty circuit

* d

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-08-18 16:34:43 -06:00
potato1234_x
1952618203 Tea Plant and Blue Pumpkin (#25092)
* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks
2024-08-18 16:28:18 -06:00
Deatherd
878384dbb0 Sharks Go RAWR! (#31142)
shark makes RAWR!
2024-08-19 01:18:07 +03:00
lzk
8830e26e0e small figurines voicelines update (#31167) 2024-08-18 15:56:35 -06:00
lzk
d0bd26d575 pizza and pizza box tweaks (#31171) 2024-08-18 15:55:41 -06:00
Nemanja
a540b8840e Goliath mob (#30839)
* Goliath mob

* Update asteroid.yml

* mcfuck yourself

* add cloak

* fixes

* Update materials.yml
2024-08-18 12:22:36 -04:00
Unkn0wn_Gh0st
73331416e3 Coughing and coughing changes (#30893)
* Coughing

* Merge branch 'space-wizards:master' into coughing

* Coughing

* Coughing
2024-08-18 12:00:42 -04:00
SlamBamActionman
7d48cc5e24 Add atmos directional sign (#31155)
* Xeno walls

* Fix icon smoothing for the walls

* Added a bunch of items, and the map/shuttle

* Fixed construction graphs

* Put the map in the right place gosh

* Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated properties

* Fix APC names and stuff

* Updated to v1.1
2024-08-18 11:44:09 -04:00