Commit Graph

8245 Commits

Author SHA1 Message Date
Plykiya
02ca514bde Fix gauze stopping if it stops bleeding (#28844)
delete a line

Co-authored-by: plykiya <plykiya@protonmail.com>
(cherry picked from commit 1d4d6c33317f58f05180abb63ddf6419f5296d25)
2025-07-12 01:47:41 +10:00
blueDev2
755991ab74 Fixed hypo and injector entities going into disposal units (#28317)
(cherry picked from commit 3efd7559b02105a5b1266fc30106b5dd5ca2aa79)
2025-07-12 01:47:41 +10:00
Plykiya
dfc90ac2fc Internals are kept on as long as any breathing tool is on (#28595) 2025-07-12 01:47:40 +10:00
Mervill
4f995b8941 Fixs suffocation alerts not appearing. (#31115)
Fixs suffocation alerts not appearing

(cherry picked from commit 63762d85ca4f68de70830dc4fd5daaa3065cc002)
2025-07-12 01:47:40 +10:00
Mervill
f9e2364c61 Remove obsolete code from Food, Drink and Respirator systems. (#30560)
* Remove obsolete code from Food, Drink and Respirator systems

* remove obsolete comment

(cherry picked from commit af752586018fa7323caa6e2047dcc8f6dbaa6d48)
2025-07-12 01:47:39 +10:00
Plykiya
2310eaeb6e Update vomit organ smite to not use Component.owner (#29926)
* Update vomit organ smite to not use Component.owner

* is this what you want...?

* am I winning, dad?

* update the comment

* we love entity<t>

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
(cherry picked from commit 2a7883b92e59f3a5464db8602ab589e3ab346097)
2025-07-12 01:47:39 +10:00
Plykiya
c17bad40a8 Eating and Drinking Doafter Change (#30060)
My lawyer told me to do this

Co-authored-by: plykiya <plykiya@protonmail.com>
(cherry picked from commit 1aa2410f4ef179a37c351b12b23da9126be2b72e)
2025-07-12 01:47:38 +10:00
Smirnov Peter
4cc6f6540f Add item checking for moth food (#30019)
* Add ContainerContainer component checking for moth food

* Use ItemSlotsComponent checking on food item

(cherry picked from commit 2fb2cde1253f08488df14cb3c6bc6735903cc0fc)
2025-07-12 01:47:37 +10:00
Plykiya
0ff641cac3 Stop eating food if you drop it (#29854)
* Stop eating food if you drop it

* woops, unused param

* comments

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

(cherry picked from commit 2349fb485e1ebabb99a01dce511e5c33c868ba2b)
2025-07-12 01:47:37 +10:00
Plykiya
b83659782d Update RespiratorSystem.cs to not use Component.Owner (#30426)
Update RespiratorSystem.cs

Co-authored-by: plykiya <plykiya@protonmail.com>
(cherry picked from commit ba1610012a1f5e4fd6f9330aed91535176fb51ad)
2025-07-12 01:47:36 +10:00
Verm
acd0f7482d Make automatic gasps not create a chat message (#28907)
No chat gasp

(cherry picked from commit 0e32d632faf27dd6903369237328dffbaa96dc0a)
2025-07-12 01:47:36 +10:00
Spatison
34657e9f57 Remake gasp popup to emote (#27736) 2025-07-12 01:47:35 +10:00
lzk
5b598b6cee Remake gasp popup to emote (#27736) 2025-07-12 01:47:34 +10:00
Benjamin Velliquette
537c80aabc Fix Reagent Grinder being able to do work without being powered (#30267)
* Check if grinder is powered before doing work

* Use existing extention method.

(cherry picked from commit a32f9ff711c8f5bf19db5819ca5799e41db39014)
2025-07-12 01:47:33 +10:00
osjarw
3afa32271d NPCs no longer consider anchored pipes as weapons (#30061)
* Anchored pipes are no longer considered weapons

* Switch to overload utilizing a TransformQuery

(cherry picked from commit 644736b382a900645494ab32bfe9f0bd8ba25b4b)
2025-07-12 01:47:32 +10:00
osjarw
d3ab2e1413 Implement Health Consideration for NPCs (#29922)
Implement TargetHealthCon

(cherry picked from commit 3ee7d7bc353dffccc0fee088d2480bb11cf78c3a)
2025-07-12 01:47:32 +10:00
beck-thompson
864ecb9c02 Replaced some AddMarkups with AddMarkupOrThrow (#30632)
* First commit

* Silly me

* bruh

(cherry picked from commit ee922e37f6539a5c3da94e76a1a0efef4c8e2b59)
2025-07-12 01:47:31 +10:00
SlamBamActionman
4959f88522 Better DNA forensics & ReagentData (#26699)
* Added the ability for blood to track DNA using ReagentData; Forensic Scanner now accounts for solution DNA, non-DNA holders have "Unknown DNA"

* Removes touch DNA for puddles, adds DNA to vomit

* DNA now leaves traces in containers and those marked without don't show DNA on scan (except for puddles), gibbed parts have DNA

* Fix stupid metamorphic glass bug grrr

* Removed SpillableComponent since DnaSubstanceTraceComponent is used instead

* Removes data field from maps, adds DNA tracking for some missed items

* Give default value, fix missing values.

* Fixes recipe bug

* Review changes

* Make the Data list into a nullable type

* Revert map changes

* Move gibbed unknown DNA to forensicssystem

(cherry picked from commit 07174d0aaf2832bc6ecc3a6baba21bc0aa5e0556)
2025-07-12 01:47:22 +10:00
Will-Oliver-Br
a2217f0189 Fix Chair Mapping (#2422)
Fixes chairs disappearing when saving the map and adds the ability to
enable/disable locks on office chairs.

---

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/277d6ee8-cc51-47df-8b81-0b361234227d

</p>
</details>

---

🆑
-  tweak: Now you can enable and disable the locks on office chairs.
2025-07-12 01:42:00 +10:00
Plykiya
291ee6cd15 Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)
* Add BreakOnDropItem, update do afters, remove unnecessary declarations

* bola

* Changed my mind about the nuke

* gennies too

* Make the comments more clear.

* Sorry for the trailing commas

* Revert "Sorry for the trailing commas"

This reverts commit e60fd9a30977393df3344948e6d5c0ce035723cd.

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

(cherry picked from commit 190ceda02eab7b3eee7d34542c35e5a3f4a8b487)
2025-07-12 01:40:21 +10:00
deltanedas
f340c033b9 item cabinet rework + stuff (#26779)
(cherry picked from commit 404fe818e8dffc9166c8572a4725283a5b88a5cd)
2025-07-12 01:39:19 +10:00
Spatison
bad6a07728 some wizmerge fix 2025-07-12 01:38:01 +10:00
dragonryan06
383ea5d744 Add new icon for Remove Evidence verb (#28898)
(cherry picked from commit b091a55d7d1e24962fdc2c924e0ae2ac8e4a14ee)
2025-07-12 01:35:39 +10:00
beck-thompson
4caa4953a0 Added verb for removing evidence! (#28101)
(cherry picked from commit 54a38daee57f918939cbda5fdc25ec7e0ff04d24)
2025-07-12 01:35:28 +10:00
Kara
0e9ac91ed3 Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content

* pass entman

* dog ass test

* webeditor

(cherry picked from commit 993eef1e7c22b2b79e528967ef5bb669f50236b1)
2025-07-12 01:31:53 +10:00
Plykiya
c9e539b008 Move PaperSystem to Shared (#30592) 2025-07-12 01:31:51 +10:00
dffdff2423
9e5165661e Add an option to the admin fax menu to lock papers such that they can't be edited by cybersun pens (#28972)
* Add option to adminfax for locking papers.

* Replace dummy control with margin

(cherry picked from commit e8b3042a3874b839f0c3898864f64ecb547ef8ba)
2025-07-12 01:13:24 +10:00
Leon Friedrich
7c9cb44466 Use non-generic TryComp() for metadata & transform (#28133) 2025-07-12 01:13:23 +10:00
Tayrtahn
52c205dd0b Random book story generator refactor (#28082)
* Randomized book overhaul

* Fix prototype names

* Improved setting paper content

* Praise Ratvar

(cherry picked from commit bad3bb4a89736b7b8b343dc14e0d0259ab7e45a1)
2025-07-12 01:13:21 +10:00
Tayrtahn
88408b1637 Fix unlabeled jugs in ChemVend (#29178)
* Spawn dummy entities on client for vending machine UI

* Asked sloth, and we kinda need this pr

---------

Co-authored-by: Vasilis <vasilis@pikachu.systems>

(cherry picked from commit ac1bdd2c840a126b9f5114440b6b26c08c7ea0c4)
2025-07-12 01:12:52 +10:00
lzk
56c71de02f Add reward line in bounty label (#28853)
(cherry picked from commit 41a0ffba38e367f4f0d134e7acfb1493adaf04f6)
2025-07-12 01:12:51 +10:00
lzk
b5eb728559 Add order quantity to cargo invoice label (#28821)
(cherry picked from commit c3720f9fd9922c37c5434ad8e93b67734789db83)
2025-07-12 01:12:49 +10:00
eoineoineoin
6a3d66ab69 Objects ordered through cargo system shouldn't start anchored (#28115)
* Order normal space heater instead of anchored variant

* Make sure ordered objects don't spawn anchored

* Order space heater flatpack instead of a regular space heater

* Remove obsolete TODO

* Remove unnecessary name

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
(cherry picked from commit 229f6d697cd1234f1d187bce79f70fe098571285)
2025-07-12 01:12:47 +10:00
Pieter-Jan Briers
a1f703701d Fix bugs resulting in quantum APC visual states (#29475)
There were TWO bugs here

FIRST, APCs *did* update their visual state on initialization, but at that point the relevant power state hasn't been initialized yet, so it always returns a bogus result. There aren't guaranteed to be subsequent power updates that actually trigger the APC to update so this can get it stuck.

Fixed by just deferring the on-init update to be after the first update tick, which is itself ordered to be after power update.

SECOND: Once I fixed that, I ran into the issue that APCs created at *server startup* also fail to update, because the throttling system (to prevent frequent APC updates) thinks the LastChargeStateTime was at server startup.

Fixed by making that variable nullable so it defaults to null.

Also removed the useless datafields on the "last update" fields. These are all just used to cache and throttle updates, something that should not be persisted to a map file.

(cherry picked from commit 797aebb161d9574379e2a1db239af793bd8e0cb2)
2025-07-12 01:12:46 +10:00
metalgearsloth
d67022016a Don't update APC states unless UI open (#27803)
(cherry picked from commit c53b5d422dd0bdcd5b0d1d8b8b27ff60f938273c)
2025-07-12 01:12:46 +10:00
ScarKy0
bfb0c00dfc Fix access configurator debug assert (#34330)
* fix

* greytide fix

* fix admin log

* Dirty

(cherry picked from commit dd28f17b9a28e17c5281f7c18d8e63fc1291abce)
2025-07-12 01:12:45 +10:00
eoineoineoin
4fc9be36b7 Make APC UI work correctly with multiple users (#32465)
* Make APC UI work correctly with multiple users

* Check access only on client, when constructing UI

* Do TODO (Thanks, Robust 236.1)

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
(cherry picked from commit 70b7747fddd58d556c1408464dcf969cdeb4a71a)
2025-07-12 01:12:44 +10:00
metalgearsloth
2f8effbc62 Implement Equals for ApcBoundInterfaceState (#27965)
* Implement Equals for ApcBoundInterfaceState

Saves a lot on bandwidth. Also made it round to the nearest 5.

* Also this

(cherry picked from commit ce0a175c731bf205f59cb93dcb3a2268c4cedb24)
2025-07-12 01:12:44 +10:00
Will-Oliver-Br
345b8bcaf6 Port Cartridge Autoinjector (#2258)
Port cartridge autoinjector from
[Goob-Station](https://github.com/Goob-Station/Goob-Station).
Prs:
https://github.com/Goob-Station/Goob-Station/pull/953
https://github.com/Goob-Station/Goob-Station/pull/1021
https://github.com/Goob-Station/Goob-Station/pull/1085
https://github.com/Goob-Station/Goob-Station/pull/1798
https://github.com/Goob-Station/Goob-Station/pull/2298

---

<details><summary><h1>Media</h1></summary>
<p>

![Captura de tela 2025-04-16
224533](https://github.com/user-attachments/assets/3fa566a7-75fe-4b6d-abd3-66a43a4a8f4c)

</p>
</details>

---

🆑 Aviu00, a-person5660, SolsticeOfTheWinter, pheenty, Will-Oliver-Br
- add: Added a medical and security cartridge autoinjector.

---------

Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: a_person <40855173+a-person5660@users.noreply.github.com>
Co-authored-by: Solstice <solsticeofthewinter@gmail.com>
Co-authored-by: Ted Lukin <66275205+pheenty@users.noreply.github.com>
2025-07-12 01:12:29 +10:00
VMSolidus
df74a915f7 Turrets Shoot Laying Down People (#2427)
This fixes an issue whereby turrets were not capable of hitting players
who lay down on the floor. Now turrets have a 50% chance to hit them
anways, meaning that laying down offers some, but not perfect protection
from turrets.

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/599583be-d298-452c-8b1b-f32d8d545131

</p>
</details>

🆑
- fix: Turrets and NPCs can now hit players who are laying down on the
floor. They (by default) have a 50% chance to miss players who are
laying down, meaning it still offers some protection, but not perfect
protection from turrets.
2025-07-12 00:57:29 +10:00
VMSolidus
1975b877e6 Machine Languages (#2426)
# Description

This PR fixes a bug whereby the Holopads weren't respecting languages,
and actually basically every machine in the entire game wasn't. There's
an in-general broader issue that I would reaaaaaally like if UI elements
in general could be differentiated by language, but that's a lot harder
to do than this fix. This was shockingly easy to fix actually.

# Changelog

🆑
- fix: Holopads now correctly respect the speaker's language, and
transmit said language to the receiver. They are no longer Universal
translators. Have fun yelling at people over the holopad in whatever
obscure language your character knows.
- fix: Nearly every machine that can speak, now correctly respects that
languages exist. For example, mice can now no longer understand what
vending machines are saying.
2025-07-12 00:55:52 +10:00
VMSolidus
dc52f8bf2b Mood Rework Part 1 (#2425)
This PR significantly reworks some parts of the mood system, namely by
completely restoring and reworking the saturation scale shader so that
its not completely terrible. Additionally, I've added numerous new
instances and locations where Moodlets can be found in the game,
particularly when it comes to food and drugs, as well as a new Mood
interaction with the Deep Fryer. Chef gameplay is significantly expanded
via the introduction of flavor related moodlets, as well as the almighty
deep fryer giving a unique, moderately strong, and long lasting moodlet
to anyone who eats whatever you deep fry.

Go ahead, give someone a deep fried stick of salted butter coated in
chocolate. You'll make their day.

The big differences with the Saturation Scale are that its now variable,
with smooth transitions, with the scale scaling with your character's
mood. The more depressed you are, the more desaturated the world
becomes. Whereas if you have entirely too many positive mood bonuses,
the world becomes incredibly vibrant.

<details><summary><h1>Media</h1></summary>
<p>

Shoukou's Bar as seen by someone with the Sanguine trait(and no other
moodlets)

![image](https://github.com/user-attachments/assets/bf8e7b25-5243-41ee-a6ad-3170444faae6)

Max mood

![image](https://github.com/user-attachments/assets/fc03ee20-37a5-4163-ac35-8f2735f8b531)

Saturnine trait:

![image](https://github.com/user-attachments/assets/fc21fc20-81e5-4364-807f-fcef40837ade)

Minimum mood(dead)

![image](https://github.com/user-attachments/assets/b38e8ce8-0ea2-436d-b298-b1a715b0a6c2)

Smooth transitions for shader tone.

https://github.com/user-attachments/assets/3ab55da1-eca6-4cc5-9489-f4ad13ed0f27

</p>
</details>

🆑
- add: Re-enabled the "Mood shader" after significantly reworking it.
Mood visual effects now scale with your character's mood, instead of
only ever being near-greyscale. Being high life now makes the world more
colorful and saturated.
- add: A huge variety of medicines, drugs, and even food items(based on
flavor!) now have mood effects. Reaching for the packet of salt now
actually makes food provide a better mood buff.
- add: Being Tear-gassed causes a massive mood penalty.
- add: Deep frying food provides a strong mood bonus.
- add: Added new Manic, Mercurial, and Dead Emotions traits.

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
2025-07-12 00:55:42 +10:00
Kutosss
0bfe3af9ba Merge pull request #662
* Fix
2025-07-05 13:38:44 +10:00
vanx
fe53a53ead Merge pull request #664
* no cold

* touch up
2025-07-05 13:35:32 +10:00
RedFoxIV
cb1d830dcf [fix] Assteroids (#653)
* ass

* оно так, оказывается, чуть-чуть лучше работает

* очень важный фикс!!!
2025-07-05 13:03:18 +10:00
vanx
b90965177f [Add] Alert Level Locks (#635)
* alert lock pog

* locale

* fix

* make it better

* count

* review

* review 2

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-07-05 12:22:19 +10:00
RedBurningPhoenix
1ff67e0309 [Fix/Tweak] Vendomats and smuggling (#621)
* NoMoreFreeItems

* Okay

* Okak...

* attrib. + markings

* space

* OkakX2
2025-07-05 12:14:22 +10:00
Spatison
5273d6e547 [Fix] Wonder Test (#650)
* fix wonder

* fix linter

* fixs
2025-06-30 08:48:00 +03:00
vanx
ac38c588eb [Tweak] Gunplay (#630)
the gunnening

Co-authored-by: vanx <discord@vanxxxx>
2025-06-30 15:46:54 +10:00
RedFoxIV
02c40439f0 [fix] [возможно, но не точно] a steroids (#634)
* let's try this

* whoopsies

* fugg
2025-06-28 11:31:40 +03:00