Commit Graph

27658 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
3850317a37 Update entities.ftl (#418) 2024-08-22 19:00:29 +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
3d864eb0fd Merge pull request #413 from crystallpunk-14/ed-19-08-2024-upstream
Ed 19 08 2024 upstream
2024-08-21 16:35:11 +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
PJBot
e438b8b25f Automatic changelog update 2024-08-19 14:04:13 +00: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
Caconym27
7a0ee1a074 Added nose coverings on gaiters (#31116)
Added 2 pixels on the front of the left and right views of the red and black gaiter sprites so that they would properly cover the nose of their wearers, as they do in reality.
2024-08-20 00:00:16 +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
Cojoke
6c3dad4330 Fix Pacified Damage Dealing Thrown Objects (#31183) 2024-08-19 13:56:40 +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
PJBot
015cf36469 Automatic changelog update 2024-08-19 11:15:36 +00: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
PJBot
972bd566f5 Automatic changelog update 2024-08-19 10:34:47 +00:00
beck-thompson
d297852ba8 Seed vend restock price increase (Fix test fails) (#31185)
First commit
2024-08-19 12:33:41 +02:00
PJBot
61f756de8a Automatic changelog update 2024-08-19 07:55:41 +00:00
lzk
c3f42438f2 Cheese tweaks (#31168)
* Cheese tweaks

* 22221241256247849`
2024-08-19 10:54:34 +03:00
Spessmann
8486b24db9 Cog update (#31188)
buffed cog atmos so now its massive
2024-08-19 01:10:43 -06:00
PJBot
e85ab9195c Automatic changelog update 2024-08-19 03:40:06 +00:00
Killerqu00
2c98d0a519 clarify what is an important role in rule 12 (#30818)
clarify what is an important role
2024-08-18 21:39:45 -06:00
Nemanja
476c7751c4 Recycler Overhaul (#30802)
* Recycler overhaul

* remove
2024-08-18 21:39:00 -06:00
PJBot
1fa447f769 Automatic changelog update 2024-08-19 03:33:22 +00: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
PJBot
1a3dc66d24 Automatic changelog update 2024-08-19 03:29:56 +00: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
PJBot
d11a4ba1f5 Automatic changelog update 2024-08-19 03:22:50 +00:00
Brandon Hu
dd36c85b61 add(AdminGhost): Add a multitool to the admin ghost backpack (#31002) 2024-08-18 21:22:10 -06:00
DieselMohawk
802d478e21 Security Helmet Reshape (#30961)
Mildly Reshapes The Sec Helmet
2024-08-18 21:21:44 -06:00
PJBot
1ba508aef2 Automatic changelog update 2024-08-19 03:20:25 +00:00
TheWaffleJesus
1c29310faf ERT chaplains can now use bibles (#30993)
ert chaplains can now use bibles
2024-08-18 21:19:19 -06:00
PJBot
9b8e30a0b7 Automatic changelog update 2024-08-19 03:17:11 +00: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
PJBot
e2ecd804b6 Automatic changelog update 2024-08-19 03:14:09 +00: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