Commit Graph

7445 Commits

Author SHA1 Message Date
Red
acc8093f9a More economy fixes (#1356)
* fic

* Update base_instruments.yml

* fix

* Update chests.yml
2025-06-02 18:06:56 +03:00
Ed
d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
2025-05-27 12:21:14 +03:00
Errant
99236def28 comment out slotblocker yaml (#37827)
* comment out slotblocker yaml

* let me fix this real quick xD

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-26 00:05:47 +02:00
YoungThug
b95bcbffed Rat King Chat Indicator (#37184)
* Rat King Chat Indicator

* BUFFRATWHEN

* Added it to the crown wawa

* Ignore this

* Whats the limit for stuff I can put here?

* Fix da merge conflicts for real this time

* WE DID ITgit add -A

* Errant Requested Changes
2025-05-22 01:47:04 -04:00
Wolfkey-SomeoneElseTookMyUsername
e72e25aba1 Add disposal signalers (#37535)
* Add disposal signalers

* Sprite changes

* Some requested changes

* Requested changes + change spelling to be with two l's to be consistent with the remote signaller
2025-05-21 22:18:57 -04:00
ArtisticRoomba
7d7858d41c Significantly improve Tesla generator power stability (#37626)
* Significantly improve Tesla generator power stability

* Second round of balancing
2025-05-21 21:39:48 -04:00
AsnDen
d7a17739c6 Screaming for cyborgs (#32329) 2025-05-21 12:49:56 -07:00
HTML/Crystal
3385c45d80 Change Arachnid Layering (#36357)
* 1 commit ops

* untouching this before anyone has to tell me
2025-05-21 10:40:55 -07:00
mubururu_
4d0a0ac5c5 make some stuff require two hands (#37683)
* get splitted

* thievy 1 handed

* scarko changes
2025-05-21 19:11:34 +02:00
mubururu_
588bc52f26 inhands for Syndicate Things (and thief beacon) (#37682)
* initial

* splitting this b

* thief bacon 1 handed

* why is test fail

* dont fail please

* "requires"

* evil tests
2025-05-21 11:39:29 -04:00
ArtisticRoomba
3d5534199e fix soil locale (#37674)
* fix soil locale

* xdd
2025-05-20 23:36:06 -07:00
Minty642
ebcbdf3077 Adding fungal soil (#36245)
Co-authored-by: aliser <20380250+murolem@users.noreply.github.com>
2025-05-20 21:59:51 -07:00
Kittygyat
f5df6a59b7 Slime storage QoL (#37592) 2025-05-20 18:55:20 +02:00
B_Kirill
f07b2aa6c3 New fun meteors (#37327)
* New fun meteors

* Forgot about newline

* Fix

* Wow, a new test

* Okay

* Fix

* Fix 2

* I hope this is correct enough

* Attribution

* Attribution 2
2025-05-20 23:04:27 +10:00
SeamLesss
0766857112 Bombsuit Description Fix (#37631)
simple as that
2025-05-20 08:58:08 -04:00
SpeltIncorrectyl
97e6127cf0 Give kammerer tighter spread so it's not a complete downgrade to the enforcer (#37616) 2025-05-19 15:45:18 -07:00
Entvari
72501bac10 Researchable & Printable Hyper Capacity Cells (#37619)
* wowwww batterie

* americanized the spelling of "maximised" to "maximized"

* changed recipe to be more unique from microreactors

* addressing requested changes
2025-05-19 18:35:08 -04:00
SeamLesss
9664ebc446 Mirror Shield Contraband Fix (#37620)
easy change
2025-05-19 18:04:22 -04:00
Red
b07fadf5b0 EntityLootTable deleted (#37604) 2025-05-19 19:53:29 +10:00
keronshb
054d35a4f8 Force Wall Tweaks (#37525)
* Reduces forcewall time to 10 seconds

* Increases force wall action delay to 15

* Adds Special Wall Layer

* Fixes indenting. Changes Mask and Layer to Special Wall Layer

* Update Resources/Prototypes/Entities/Structures/Walls/walls.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-19 03:30:46 +02:00
Simon
fc52165c9b Make Nukie and Wizard Comms Console not announce who it was sent by (#37567)
* Make Nukie and Wizard Comms Console not announce who it was sent by.

* Add doc-comment to field
2025-05-18 19:18:18 +10:00
ScarKy0
30537e13a4 Bomb Deliveries (#37069)
* init

* BOMB!!!

* review

* partial review

* review
2025-05-18 10:57:22 +02:00
Peptide90
5b7c00b374 Adds marker component to roof markers (#35453)
* Adds marker component to roof markers

So now you can show and hide them properly.

* a

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2025-05-18 18:14:31 +10:00
Nemanja
4fdfa9386b De-loot salvage, add reward crates (#37561) 2025-05-17 23:40:59 -07:00
ArtisticRoomba
95cc36c41d Atmos Air Grenades (#37531) 2025-05-17 21:32:51 -07:00
Oleshe
4b357f236b Jigger transfer amount (#35962) 2025-05-17 21:14:23 -07:00
Nemanja
0d878751fa Salvage Job Board (#37549)
* Salvage Job Board

* More development

* Small boy

* Computer yaml (partial)

* UI

* Rank unlock logic

* Job label printing

* appraisal tool integration

* Jobs

* add board to QM locker

* boom!

* command desc

* mild rewording

* ackh, mein pr ist brohken
2025-05-18 14:02:52 +10:00
Spangs04
9af1d69e30 Telecoms Resprite (#35811)
* Medical and Science Servers

Resprited  medical and science servers

* Delete server-off-Recovered.png

* Telecoms and Camera Servers

* Add Copyright

* Fix Rsi

* Minor Stripe Displacement Fix

* Telecoms Sprites

* Telecoms Display Update

Partial Update of the Sprites, Copyright and some YML and JSON changes

* Fix Linter and YML and Finalize

* Remember Lost Router Child

Fix Linter Again (hopefully) and add sprite to entertainment and wireless camera routers

* Requested Review Changes and ect

Changed how the servers dictate how to display whether they have no keys or if they have a mix of keys.

* Re-Run Checks

* Handful of requested changes

* Fix?

* Revert Last

* old yeller

* pushforpr

* Remove Old Files

* Fix Json

* fix rsi for real...?

* Fix Camera Servers

Servers were still calling to telecoms instead of the server sprites

* New Telecom Darken Attempt #1

* Slight stripe change

* Random Whitespace fix

* Fix2boogaloo
2025-05-17 22:10:56 -04:00
Perry Fraser
ed7fb54526 tweak: Allow cutter machines to be linked to ore silos (#37554) 2025-05-17 21:51:57 -04:00
Ilya246
356dabb9c9 shuttle impacts port (#37422)
* initial

* adjust densities and thruster hp

* Fix evil hack

* Last stuff

* review, cleanup

* admin RW

* minor cleanup

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2025-05-18 03:11:08 +10:00
ArtisticRoomba
d33d3bf99e Buff singularity rad collectors (#37475) 2025-05-17 00:45:44 -07:00
Nemanja
5424433604 Remove Basic Hardsuit & Associated Files (#37315)
* Remove Basic Hardsuit

* retaliatory action

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2025-05-17 16:15:29 +10:00
ArtisticRoomba
14f574e17d Buff metal foam grenades (#37476)
* Buff metal foam grenades

* oh and cant forget my main

* Yeah, no, trolling someone because they didn't powergame a crowbar shiftstart is bad
2025-05-17 15:21:24 +10:00
Banedon
a39d3334d6 The Hatening / Hide hair when hats are equipped (#36818)
* changed HideLayerClothing on some entities YAML

* Use HideLayerClothing with slots, layers does not work for some reason

* Hattened again

* Mooore ! I touched the clown mask, beware

* Fix typo from "Slide" to "Side"

* Build issue, test with commenting out error part

* Trying again...

* Trying for fix
2025-05-17 01:05:43 -04:00
Samuka-C
722620c1cf Xenoborgs part 3 (#36867)
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
2025-05-16 20:59:48 -07:00
Nemanja
c188fd07f2 Give VGRoid its name back (#37513) 2025-05-17 11:27:11 +10:00
Qerd
2de0a5fc82 Not exclusive whitelist diet. Vox regain access to old food. (#37497)
* Creates a secondary digestible whitelist that is not exclusive. Additionally reworks the Vox stomach.

* Update FoodSystem.cs

Remnants of an old attempt. Cleaning it.

* Update vox.yml

Remnants of an old attempt. Cleaning up.

* Whitelist no longer, now the diet exclusion var is a bool.

* Clean-up

* Update Content.Server/Body/Components/StomachComponent.cs

Typo fixing

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Body/Components/StomachComponent.cs

Clarifications.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Nutrition/EntitySystems/FoodSystem.cs

Typo fixing

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Resources/Prototypes/Body/Organs/vox.yml

Typo fixes

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-05-16 12:05:49 -07:00
Velcroboy
d5ef9b7345 Wall inheritance cleanup (#37436)
* Cleanup walls.yml

* quick check

* Fix tilewall cmd

* More Cleanup

* Arrnrtrayiage

* Remove double parenting

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-05-16 09:17:21 -04:00
lzk
19f9f84a13 Allow recycler to shred clothing (#31518)
* Allow recycler to shred clothing

* reduce

* change comments

* replace ClothMade with Recyclable

* Update Resources/Prototypes/Entities/Clothing/Head/hats.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* requested changes

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-15 19:44:48 -04:00
Jessey van Hoeijen
625115d78a Change plushie rotation on wide swing (#37484)
Changed swing rotation on shark, carp and snake plushies
2025-05-15 08:56:28 -07:00
Chartman
7b46749e0e Soaked Smokes Volume Revert (#37482)
Reverted the volume of Dan's Soaked Smokes to their previous maximum.
2025-05-15 10:47:30 -04:00
metalgearsloth
7ec37451d0 Revert "Fix goliath tentacle exploit (#37168)" (#37479)
* Revert "Fix goliath tentacle exploit (#37168)"

This reverts commit 6fbd0c9da1.

* wawawewa
2025-05-15 12:54:20 +02:00
Blitz
b7000dfbbb No more one handing "snipers" (#33708) 2025-05-14 21:12:23 -07:00
Nemanja
6fbd0c9da1 Fix goliath tentacle exploit (#37168) 2025-05-14 20:55:04 -07:00
kosticia
5db92c4ed0 make small animals don't leave organs on gibbing (#37080) 2025-05-14 20:45:49 -07:00
Southbridge
7e624d1418 Animal Spawner Reorganization + Xeno Spawners (#36962)
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2025-05-14 20:25:08 -07:00
slarticodefast
1aeb1ed295 Fix some paradox clone traits (#37467)
fix some paradox clone traits
2025-05-14 18:45:47 -07:00
Nemanja
91e441ada1 Infer NumberSelector type in EntityTables (#36568)
* Infer number selector types from context

* forgor
2025-05-15 11:21:54 +10:00
Flareguy
338665a3ca Add hivebots (#37275)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-05-14 18:09:23 -07:00
Velcroboy
8fab6556e2 Changes suffix for always powered handhelds for clarity (#37395)
* Changes suffix for always powered handhelds for clarity

* null->full

* Aha

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2025-05-14 19:55:52 -04:00