Commit Graph

29088 Commits

Author SHA1 Message Date
Unkn0wn_Gh0st
d006091cdf Coughing and coughing changes (#30893)
* Coughing

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

* Coughing

* Coughing

(cherry picked from commit 73331416e3e7e9e1cd4c1ee1aaac0ba65238c0a3)
2025-07-20 20:39:40 +10:00
Minemoder5000
eda2a99aa9 Shark plushies now goes rawr on hit. (#33540)
Shark goes rawr more

(cherry picked from commit 45cf4ec3400dfe82e47d3746e695248b8a6f3163)
2025-07-20 20:37:10 +10:00
SlamBamActionman
a8ead203dc [#20285 fix] Carp Plush and Rehydratables can now be put into mop bucket (#33079)
* Make shark plush janitor-bucketable

* fix bucketed grey shark texture

* Make sprites less shiny and adapt copyright notice

* Made shark way way less shiny

* Allow carp plush and rehydratables in mop bucket.

* Remove old mop bucket shark sprites

* Fix post-merge bugs

* Fix errors

* Move ReactiveContainer stuff to shared

That should mean it is now predicted.

* Custom eject verb for the mop bucket

* Fixes OnSolutionChange, removes pop-up as there already is one.

* .ftl is not necessary as the custom pop-up was removed

* Review fixes

* Update Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs

* Update Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs

---------

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

(cherry picked from commit 4626904fa8e5915a4faddd74a4d917d8442bfb99)
2025-07-20 20:37:08 +10:00
Preston Smith
74a218ac9c Fix: Make Plushie Damage Unexaminable (#33061)
Set hidden to true

(cherry picked from commit 907a9cef10bf4f0309bf2f0c6384a9bb60882f16)
2025-07-20 20:37:06 +10:00
K-Dynamic
e12d5e3562 rainbow lizard plushie (#32564)
* rainbow weh

* plushie loot table

* arcade loot pool

* remove from plushie crate

* fuk

(cherry picked from commit 0bec8af824e665ef374d232fcff553d413d8b044)
2025-07-20 20:37:06 +10:00
beck-thompson
056a3e2eba Plushies can now have pAIs stuffed into them (v2)! (#30805)
* First commit

* I forgot silly me

* Actually added comments

* spellin

* fixes

* more blacklists

* Minor fixes

* Speech Verb also changes now

* Simple name stuff

* Other fixes

* remove one line of whitespace

---------

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

(cherry picked from commit 327466a6e2e36eba03c4bee397371fec5d3e4a86)
2025-07-20 20:37:05 +10:00
lzk
6cf23ca47c Fix some locales (#30860)
* Fix some locales

* forgor

(cherry picked from commit 6926033423db8fe4a65badb33fc3540d1d01e7c8)
2025-07-20 20:37:05 +10:00
Mervill
308c09a082 Remove duplicate using from FoodSystem (#31769)
(cherry picked from commit 7040f2fd2ed4309d3808af8e99d586e4d2a40e46)
2025-07-20 20:37:04 +10:00
dragonryan06
c2d508dfca Add the Zombie, a new cocktail (#32802)
(cherry picked from commit 1e80dd289129cb4848dd45e56e08c12e0d3c6c70)
2025-07-20 20:37:04 +10:00
joshepvodka
7f5ec29bf5 Bar related tweaks (#33505)
* does everything

* beer flavor revert and linter fix

* Update Resources/Locale/en-US/flavors/flavor-profiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* fix misspelling

* fix yet another misspelling

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* english has weird spellings huh

* im starting to feel ashamed of myself

* this is shameful

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

(cherry picked from commit 9cb46d9343d7963ca1212821bceb9f41404e7725)
2025-07-20 20:37:03 +10:00
Southbridge
48fb50e0eb Add Nuclear Cola centrifuge recipe (#32441)
* Initial implementation

* currently it crashes on load, don't know why, maybe changing the products will provide some insight

* I was overlooking part of the yaml formatting.

(cherry picked from commit 5d6ec18b2a9b5e35aff8404e2167fdd460a0cc05)
2025-07-20 20:37:02 +10:00
saga3152
94e9ec2ce1 Soda water and Vodka recipes (#32252)
* SodaWater and Vodka recipes

* Changed crystals recipe in fun.yml

* plasma is now a catalyst to create crystals

* Revert "plasma is now a catalyst to create crystals"

This reverts commit 1002d9927a3597f7a02611071ef3f706cd056a41.

* Revert "Changed crystals recipe in fun.yml"

This reverts commit 30b6b602228ec1b11a46e390c6a5868494e2b61f.

* Stir to make Vodka

* Shake to make soda water

* fix

(cherry picked from commit 3e92eb1910f9bbb2455e10e4a620601e0a4d1b91)
2025-07-20 20:37:02 +10:00
BramvanZijp
2dfedf0c23 Fix Doctors Delight metabolism Rate (#32297)
* Fix Doctors Delight metabolism Rate

* Combine Drink and Medicine instead of halving their motabolism rate.

* Removed unintentional newline.

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

* Remove metabolismRate since it is setting it to the default.
2025-07-20 20:37:01 +10:00
Ed
767ed6b712 Flora anomaly seeds (#31987)
* content

* Update meta.json

* Update mobspawn.yml

* Update mobspawn.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml

* Update Resources/Prototypes/Entities/Effects/mobspawn.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
(cherry picked from commit 2ea54b1913c73660ad056e12b891ebc5e99fb8e0)
2025-07-20 20:37:01 +10:00
lzk
41c47b0227 pizza and pizza box tweaks (#31171)
(cherry picked from commit d0bd26d575a1d5f07467d8381de4e7eebd982124)
2025-07-20 20:37:00 +10:00
Joel Zimmerman
9347a5b5f0 Made the dank pizza actually dank (#30430)
* made the dank pizza actually dank

* made the dank pizza also contain some nutritional value

(cherry picked from commit aad2441f305d62b0647b6d42f42388d2c0813886)
2025-07-20 20:37:00 +10:00
TheKittehJesus
b76c53ae65 Four cooking recipes changed to use liquid egg instead of whole egg, and 5u of milk added to cake batter (#30262)
* Changed four cooking recipes to use egg fluid instead of whole eggs, see issue #30123

* Added 5u of milk to cake batter due to it becoming a subset of brownie recipe and occurring in beaker

(cherry picked from commit 18370c3d1c7a599153fa71b5ca6037579edfd975)
2025-07-20 20:36:59 +10:00
mkanke-real
08192500a3 Add spicy rock pizza (#30116)
* Added all the parts to implement spicy rock pizza

* Added sprites for pizza

* Fixed coma formatting in meta.json for pizzas

* Fix formatting and rebalance reagent quantities in pizza.yml

* Flipped Uranium and Radium values to be the correct ratio

* Updated meta.json file to have credit for sprite

(cherry picked from commit e1f3bdc7487a54f496e4a8b640eba68d12f91f9f)
2025-07-20 20:36:59 +10:00
jmcb
ec79956fee Fix typo in pineapple pizza description (#29714)
(cherry picked from commit bc7c1217130efb7106dd7b60052ed970d57bbb1a)
2025-07-20 20:36:58 +10:00
Leon Friedrich
7046d80f16 Hide role entities in the spawn menu (#32798)
(cherry picked from commit 2d60a4684c771b350d9c3c0dab794aa21de624e5)
2025-07-20 20:36:57 +10:00
Pieter-Jan Briers
11197cd773 Comment out broken guidebook test speech code (#35398)
This code blatantly doesn't work and causes compile failures with https://github.com/space-wizards/RobustToolbox/pull/5540. It's only used for testing purposes, so we're just removing it.

Basically taken from https://github.com/space-wizards/space-station-14/pull/33610 in another PR, so I can merge this first separately.

(cherry picked from commit 1ef28203ea272d95881ee98ae7b594998c462ed5)
2025-07-20 20:36:41 +10:00
Spatison
d36469184f return OreBananium biomeMarkerLayer 2025-07-20 20:34:36 +10:00
ElectroJr
ad6b81233d Refactor map loading & saving (#34020) 2025-07-20 20:34:12 +10:00
SimpleStation Changelogs
a1013e7c2a Automatic Changelog Update (#2494) 2025-07-20 16:10:13 +10:00
ScarKy0
3dc9e4a433 Derelict Borg Revival (#33433)
* Derelictn'tn't Borg!

* Clean *sparkles*

* Removed "S: Awaiting Changes"

(cherry picked from commit 274c3ab0b923af5f6d05a2965861df8b4a1cfdbc)
2025-07-20 16:09:31 +10:00
ThatGuyUSA
08366e25be Syndicate item fix ups (#33435)
tweaks and fixes

(cherry picked from commit 0f0b141f218008b41d95945355720f9fcb082622)
2025-07-20 16:05:01 +10:00
metalgearsloth
7ce5480ae2 Fix muzzle flash tracking (#30163)
* Fix muzzle flash tracking

User was never set on the networked event but we don't really need it anyway.

* Also this one

(cherry picked from commit b4ec629b9fe5ad5bf9c4c011234e282774d73ae9)
2025-07-20 16:02:56 +10:00
BramvanZijp
12d1f35dc2 Swap the advanced tool borg modules omnitool for jaws and a power drill (#32487)
(cherry picked from commit 38f59d2038913e76d14bfc975841b5ffded72bb8)
2025-07-20 16:02:56 +10:00
lzk
942ac5218d Fix uplink name (#32846)
(cherry picked from commit f387f66387790d4bc6e97d9dce53e16fbf7095d6)
2025-07-20 16:02:55 +10:00
pofitlo
26b10f1d48 Add camera bug (#30250)
* Add camera bug

* Update camera_bug.png

* fix

* change

* Update Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml

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

* Update Resources/Prototypes/Catalog/uplink_catalog.yml

---------

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

(cherry picked from commit bad7359aeb76fb92330db902af046c7e3dfa0b00)

* Update camera_bug.png

* fix

* change

* Update Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/camera_bug.yml

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

* Update Resources/Prototypes/Catalog/uplink_catalog.yml

---------

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

(cherry picked from commit bad7359aeb76fb92330db902af046c7e3dfa0b00)
2025-07-20 16:02:55 +10:00
pofitlo
c97a230b5e Syndicate business card (#32162)
* add card

* Update Resources/Locale/en-US/paper/syndicate-business-card.ftl

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* fix

* Update Resources/Prototypes/Entities/Objects/Misc/business card.yml

Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>

* add logo

* swap the "funny 'c'"

* improve logo (a little) and also fight with the funny 'c'

* fix

* oh... i think... mabe i done with this?...

* add

* smaller cards

* fix

* Update synicate_card.png

* fix typo

* fix

* fix

* Update Resources/Prototypes/Entities/Objects/Misc/business_card.yml

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Эдуард <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

(cherry picked from commit 2f286afd956899ab480a875e10c93ed085f8bf43)
2025-07-20 16:02:54 +10:00
LordEclipse
efb7f4d8a9 Antimov in both Traitor & Nukie Uplinks (#31916)
Adds Antimov AI Lawboard to Uplinks Automatic changelog update

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>

(cherry picked from commit efd989435e875a12e7044fb525ef7bd8aea9a4de)
2025-07-20 16:02:54 +10:00
HerCoyote23
1425d2db2e Corrects some typos in the uplink catalog, adjusts grammar (#31989)
* AlmostCertainlyDoesntWork

* Please work

* maybe work

* emptycommit

* test

* testest

* Empty-Commit

* Uplink grammar/typos fix

(cherry picked from commit f2615f093341c01831e457de927f994b6b88417e)
2025-07-20 16:02:46 +10:00
ScarKy0
91610cae51 AI can now speak once more. (#33196)
Yippee

(cherry picked from commit 379fb4cb6aa35d0f2567a6c874e56a2b7b76ea87)
2025-07-20 15:59:11 +10:00
Milon
162bc35521 change ShowHealthBars and ShowHealthIcons to use protoId (#32355)
use protoId

(cherry picked from commit 6f1eeba1911dc3c7e96890fa2f0a3b4f07ee2d5d)
2025-07-20 15:59:11 +10:00
AJCM-git
3091688c63 Small code cleanup to health bar (#28554)
(cherry picked from commit 619d82ed426c50a72d71ca195d901c11b09adea9)
2025-07-20 15:59:10 +10:00
Spatison
cc7155dec6 Why did you bring back that piece of shit? 2025-07-20 15:59:01 +10:00
Winkarst
2a9beea183 Fix borgs not getting names on roundstart (#33578)
* Fix borgs not getting names on roundstart

* Glory to the NT

* Allow riggable to take in multiple reagents

* Revert

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
(cherry picked from commit ab36b15080710d18179c76ddbbd4ee9edb94467b)
2025-07-20 15:57:18 +10:00
ScarKy0
67bcf493e6 Borgs can no longer see mindshield + AI can no longer toggle off seeing job icons (#33069)
* :(

* Removed the sprite + updated RSI

(cherry picked from commit e17d152838a4c34625c52ca51b8a343be5f22b36)
2025-07-20 15:56:36 +10:00
Theodore Lukin
3b1748b001 make ai speak robotically (#33025)
(cherry picked from commit ee445c49389a273e816b0e08c4ffdcf398b965df)
2025-07-20 15:54:46 +10:00
Pieter-Jan Briers
2f228e1c61 Fix borg hands showing up in stripping menu (#32606)
* Fix borg hands showing up in stripping menu

Borgs can't drop their items anyways, and the amount of hands borgs have causes the UI to just bug out.

* Add more checks

(cherry picked from commit 2d644095e342cfb5727765210bafce7c339252c0)
2025-07-20 15:53:14 +10:00
metalgearsloth
c8d4c137c9 Predict stripping (#32478)
* Predict stripping

Stops mob verbs from getting moved around again.

* Bola

* Fix ftl
2025-07-20 15:53:14 +10:00
Errant
820bbab25f suit storage whitelist code (#29332)
suit storage whitelist

(cherry picked from commit 9e4b8077f3295931556e7b1892f6b2ddcd9d7ab6)
2025-07-20 15:53:13 +10:00
ShadowCommander
e7017116bb Popup duplicate stacking (#27978)
(cherry picked from commit 49982acc883f3acdd3e5bf6cc8027cac3ba03f7f)
2025-07-20 15:53:03 +10:00
Leon Friedrich
c6bc73c541 Prevent Identity.Name NRE exception (#28433)
Fix Identity.Name exception
2025-07-20 15:49:43 +10:00
BramvanZijp
da0eec1a6c Prevent borgs from being able to be briefly toggled off. (#32485)
* Prevent borgs from being able to be briefly toggled off.

* Use the pre-existing component instead of making an unneccesary duplicate.

(cherry picked from commit f79de12509002743dcae02984b99d60656f32025)
2025-07-20 15:49:42 +10:00
Nemanja
85bd0bede8 Mineral Scanner (#31390)
* Mineral Scanner

* doink

* review

* sunday funday

* review and fix bugs i think?

* Update MiningOverlay.cs

(cherry picked from commit 85992518256e85c7980b784b6462727f9158a413)
2025-07-20 15:49:41 +10:00
Nemanja
7d3faf96ca Roundstart Grappling Gun (#31737) 2025-07-20 15:49:40 +10:00
Alzore
eeff28540d Make space scanning T1 technology (#31321)
make space scanning and mass scanner t1 tech

(cherry picked from commit 453c28f8255fff6241dbd9383902448b3fda1c65)
2025-07-20 15:49:38 +10:00
Roudenn
258cf708f9 Grappling gun's ReelRate can be changed (#30493)
* Grappling gun ReelRate can be changed

Moves ReelRate constant from SharedGrapplingGunSystem to GrapplingGunComponent, so it's Reel speed can be changed.

* Add coment + remove redudant

(cherry picked from commit f501bd500c33f5020d7e0cfe29fddef9587a286f)
2025-07-20 15:49:38 +10:00