Merge upstream [11.07.2024]#338
Merged
Gaxeer merged 70 commits intomasterfrom merge-upstreamJul 11, 2024
+1,695-702
Commits
Commits on Jul 9, 2024
Living flesh now has a 30/70% chance to touch the targeted thing instead of pulling it (tgstation#84752)
authored- committed
- authored
- committed
- committed
- committed
- authored
Makes docked shuttle departure timer reset when a hostile environment threat is stopped (tgstation#84771)
authored- committed
- committed
Commits on Jul 10, 2024
- committed
- authored
- authored
- committed
- authored
- committed
- authored
refactor: move
status_display_bottom_text
andfire_alarm_light_color
to security level prototypes (tgstation#84830)authored- committed
- authored
- committed
Commits on Jul 11, 2024
- committed
- authored
- committed
You no longer try to pull out someones eyes in combat mode if they have cranial fissure (tgstation#84822)
authored- committed
- authored
- committed
- authored
- committed
- committed
- authored
- authored
- authored
- committed
- committed
- authored
- authored
- committed
- committed
You can now see whether or not a piece of clothing is pressure-proof when examining (tgstation#84807)
authored- authored
- committed
- committed
Adds a crash report to the imprint_gps proc and removes an unnecessary arg in law.dm (tgstation#84818)
authored- committed
- authored
- authored
- committed
- authored
- committed
- committed
Adds a Contraband trait, and implements contraband as a mechanic to security bounties. (tgstation#84003)
- committed
- authored
- committed
- authored
- committed
- authored
- committed
- authored
- authored
- committed
- authored
- committed
- committed