Commit Graph

28702 Commits

Author SHA1 Message Date
Tayrtahn
ec0752c39b Fixed buckled players thrashing while speaking in beds (#29653)
* Fix characters thrashing when talking while lying down

* Remove weird design choice
2025-07-19 10:58:17 +10:00
DrSmugleaf
a98463bb11 Don't show toggle internals verb if no breath tools are found while off (#30622)
* Don't show toggle internals verb if no breath tools are found

* only if not working

(cherry picked from commit 94a1b67c673aa69ffea6745bb1c825904bb4a289)
2025-07-19 10:58:16 +10:00
Plykiya
2568b253b1 Updates GasTankSystem and InternalsSystem to not use Component.Owner (#29934)
* blah, setup

* Updates GasTankSystem and InternalsSystem to not use Component.Owner

* squish the diff

* Fixa the rest
2025-07-19 10:57:44 +10:00
themias
78f72e19b0 Don't allow toggling internals while asleep (#29753)
(cherry picked from commit 7b99d1f851d3a3be179d5307a72b213a8971af9d)
2025-07-19 10:53:25 +10:00
Stalen
d9ddc3fe4f Pets toggle internals fix (#28904)
(cherry picked from commit d322a82bdf7ff4be344d6c8350ad8867b4c625aa)
2025-07-19 10:53:25 +10:00
Ed
2e651a50b9 Fix candles (firestack fading) (#28139)
Update FlammableSystem.cs

(cherry picked from commit afb1acab10a5abc2ff954d08107c5e7866d3db8e)
2025-07-19 10:53:24 +10:00
themias
4148405ce2 Add justice helm (#31905)
* Add justice helm

* backslash moment

* spinny light

* remove power cell from recipe

(cherry picked from commit f49d83ac8168784388991bb76eb121c6a24d8654)
2025-07-19 10:53:18 +10:00
DieselMohawk
67ecb45d8b Add Red Neck Gaiter To Secdrobe (#30106)
* Red Neck Gaiter Added to SecDrobe

* Removes Gaiter From TheaterDrobe

(cherry picked from commit aaed026b5cfd5186135b42bfa83141ff8915698b)
2025-07-19 10:48:11 +10:00
Winkarst
0e65fd011e Mark the syndicate raid helmet as a Syndicate contraband (#31512)
(cherry picked from commit e9cc93c8898030fea916df17e7a47dae7ea7ba1c)
2025-07-19 10:48:10 +10:00
Boaz1111
81d9d19566 New Projectile Effect:Temperature Change (#31004)
* bah

* all done, thanks slarti

* makes the watcher do the thing

* Update TemperatureSystem.cs

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

* changes something

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
(cherry picked from commit ed3e10741f9a8abcb4c4af130a3b2f137f4a90ce)
2025-07-19 10:46:26 +10:00
Boaz1111
e267ede977 makes PKA able to mine rocks in one hit (#27476)
gives it gatheringprojectile

(cherry picked from commit 80590280158efd3094195c66a66ca52cb223ac65)
2025-07-19 10:30:34 +10:00
TemporalOroboros
de0001f725 Relocate TemperatureProtectionComponent (#30437)
Moves it from the atmos module to the temperature module where it is actually used.

(cherry picked from commit bea8c1a0b8b9c9915657ecaeafcac8b8eb31ebd7)
2025-07-18 20:08:26 +10:00
buntobaggins
8b81fe2098 Spationaut Hardsuit Light buff (#30049)
Buffed the light on the Spationaut Hardsuit

Co-authored-by: buntobaggins <email.com>
(cherry picked from commit 6b57cf202062de26f2b4c92292a2e58b268d328e)
2025-07-18 20:08:25 +10:00
Plykiya
8597489e10 Contraband Review Pass - The Threequel (#30970)
Contraband pass number three

(cherry picked from commit dc66386e5f022809ad5c289b4bb4b033adade25c)
2025-07-18 19:14:00 +10:00
Plykiya
3fd5e4b09c Contra Review Passs - Round 2 (#30942)
* Contra pass round two

* command too

* Stamps

* oopsied a bracket

(cherry picked from commit f523df821ada7b6d46f1eb7ff63b3b981f019ce7)
2025-07-18 16:03:59 +10:00
Brandon Hu
f84c9566ad tweak(NuclearBomb Keg): Give the nuclear bomb keg a hit box (#30415)
* bleh

* Bugs spread disease :(

* they are reproducing

* no lore

(cherry picked from commit 54e42cc4e5ecc404873179770b704b9eca295fdf)
2025-07-18 15:55:07 +10:00
Winkarst
b1769ffff1 Make the super door remote to be able to control Syndicate doors (#30033)
* Make the super door remote to be able to control Syndicate doors

* Fix

(cherry picked from commit ba2c5fcdedfcbc0b3cfe0d6a1a19e6547bb3adae)
2025-07-18 15:55:06 +10:00
saintmuntzer
31d918e454 fix uncapitalized "S" in Salvage Specialist (#31529)
"Salvage specialist" to "Salvage Specialist"; all is right with the world

(cherry picked from commit 2aea194065e9f73ba7a8f9a0280d42a0e0ad627d)
2025-07-18 15:55:06 +10:00
lzk
03c07b95b2 fix spelling error silicon jobs (#31581)
Update department.ftl

(cherry picked from commit f5a8be8ad3da20b2d7b88a898ed139dfdf677963)
2025-07-18 15:55:05 +10:00
IProduceWidgets
6c47aee225 No Mr.Snail, I expect you to die! (fix sprite) (#31834)
* No Mr.Snail, I expect you to die!

* emoting

(cherry picked from commit 3f3ef567fb7e8cc4a2d2e571fe0fad03694d21cb)
2025-07-18 15:54:59 +10:00
lzk
b47e97c1de Allow some mobs to walk slowly (#31360)
* Allow mice to walk slowly

* add more

(cherry picked from commit 2185f3a2a5561caea9271ad9d6d14551ceebd6a9)
2025-07-18 15:52:20 +10:00
Moomoobeef
8d78d65055 Adds flavors to a bunch of things without them (#31685)
* initial commit

* VSCodium is being dumb

I don't know why vscodium thinks I modified this whitespace when this is infact how I wrote it in the first place, but it's being dumb and I think if I reset in order to put it in the initial commit I'll have to rebase again so :P. go go gadget single byte commit

* but wait, there's more!

* missing newline
2025-07-18 15:52:09 +10:00
beck-thompson
58e8d6d56c Fix nukies not getting station codes (#31272)
First commit

(cherry picked from commit d44bbec05de0641cb31260b3ad11368f565096cf)
2025-07-18 15:51:11 +10:00
Nemanja
d280821ef9 add space carp and sharkminnow teeth (#31070)
(cherry picked from commit 0a05ee9a27ecce39c0c4923ac9a9b41c1d18d50b)
2025-07-18 15:51:11 +10:00
TheWaffleJesus
69e178e7d0 cleaning up bounty descriptions (#30981)
fixed up dumb text
2025-07-18 15:51:10 +10:00
Spatison
4ae9c8ff4b Goliath mob (#30839) missing changes 2025-07-18 15:51:09 +10:00
potato1234_x
beed765e5b Tea Plant and Blue Pumpkin (#25092)
* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks

(cherry picked from commit 19526182035345c5cf8c675691666ee2c7ffa5ec)
2025-07-18 15:51:09 +10:00
DrEnzyme
5163fafb2b Add bagels (#24799)
Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment.

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit 659010993fef23b707a646008495cf17f32af700)
2025-07-18 15:51:08 +10:00
Plykiya
2caac08bdf First Review Pass Contraband Fixes (#30930)
* First pass contra fix

* bam

* More

* Security crates are now marked as security restricted

* Syndicate raid suit is contra

* damn I forgot gatfruit

(cherry picked from commit 883dc998e6ccbb1a27e93d0ac372f8a6ee75aab8)
2025-07-18 15:51:00 +10:00
lzk
f94988b88f Make RCD ui activateable only in hand (#30861)
(cherry picked from commit f93fe05f4cec7ee52e010cda2a30800c4e485f91)
2025-07-18 15:34:56 +10:00
LankLTE
7194e3c67a Darts can now pop balloons. (#30088)
Basic implementation.

(cherry picked from commit 395b296d68318c2572bfcf67de73b71d01eb2623)
2025-07-18 15:34:55 +10:00
Mr. 27
efdd551a56 Fix hypodarts not injecting with people that have ANY outerclothing (#28301)
Update darts.yml

(cherry picked from commit 2586427c5211323ae49b387b51edc5a56255b169)
2025-07-18 15:34:55 +10:00
Brandon Hu
f465e4f8f5 chore(grammar): correct some mistakes (#30916)
(cherry picked from commit dea9a637fb563287c3606fa3690e911d8e60727b)
2025-07-18 15:33:00 +10:00
Flareguy
b7860c0cca Ports the singularity's values from vgstation (#28720)
* ports the singularity values from vgstation

* guidebook fix

* 5000 energy level 6 singulo

(cherry picked from commit f37060fc1be72e809730ad39f3ed849796168327)
2025-07-18 15:27:45 +10:00
lzk
f132196c89 Fix warning cone rotation in inventory (#30672)
(cherry picked from commit 7754ea925d4a6fa5380a6a8a0fe20fb820b20b1b)
2025-07-18 15:21:17 +10:00
lzk
912cd2ef44 Botany yaml fixing (#22865)
* 1

* Update chapel.yml

* Revert "Update chapel.yml"

This reverts commit 3e297a1b20254823a088af2aa3d179184c377638.

* add to seeds vendor

(cherry picked from commit 724cde264c7f6e639f8f80458e254baccd8af3b3)
2025-07-18 15:21:16 +10:00
Verm
ef09006cc4 Mothroaches can now wear hamster-wearable clothes + pet inventory tweaks (#28956)
* moth displacement + inventory tweaks

* Fix off by 1 on the head sprites

* Move files to main mothroach folder

* Fix mask up a bit

* Fix side mask sprites

* Change format because it changed forever ago

(cherry picked from commit 4e3e8ad03cfe14ea9e053587fc3f19ea0e6620d4)
2025-07-18 15:21:15 +10:00
Will-Oliver-Br
01639e0a2a Port SmartFridge Functionality (#2479)
# Description

Port smartfridge functionality from
[Delta-V](https://github.com/DeltaV-Station/Delta-v) and commits from
[Frontier](https://github.com/new-frontiers-14/frontier-station-14)
Pr and commits:
https://github.com/DeltaV-Station/Delta-v/pull/3207

70a9032085

2d4abf62b7

---

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

https://github.com/user-attachments/assets/a67f78ca-327c-4e08-8e34-8be6a1a59eac

</p>
</details>

---

# Changelog

🆑 sowelipililimute, Whatstone and Will-Oliver-Br
- tweak: SmartFridge now really has functionality

---------

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
2025-07-18 15:19:19 +10:00
CodedCrow
820410a957 Changed Arachn Plush Description (#2478)
Removed "Why does it look familiar?" in the description for the Arachne
plush toy.


# Description

Changed the description of the Arachne plush. Removing "Why does it look
familiar?"

Description.

---

# Changelog

🆑
- tweak: Tweaked Arachne plush description

Signed-off-by: CodedCrow <114866135+CodedCrow@users.noreply.github.com>
2025-07-18 15:16:51 +10:00
Kara
f06ae6982d Contraband marking & examining (#28688)
* System & loc strings

* pass over syndie contraband

* fixes

* grand theft pass

* contrabandexamine -> contraband

* examine text generation update

* all composition parents necessary

* bring back minor contra so it has a less confusing message

* minor

* weapon pass

* jumpsuit pass

* feet pass

* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH

* head

* AUUUUGH

* ear

* belt

* back

* fix

* bro

* rename for more clarity

* do da review

* add cvar for contraband examine
2025-07-18 15:10:58 +10:00
Plykiya
6bf16a59a7 Buff EMP implant and grenade range (#30660)
Co-authored-by: plykiya <plykiya@protonmail.com>

(cherry picked from commit 1d5a3303e1f0fdbb5641812b61f95bf27f8513b0)
2025-07-17 14:52:43 +10:00
slarticodefast
d080e7097f Make stun batons be thrown like a throwing weapon (#29883)
* make stun batons be thrown like a throwing weapon

* stun prods too

* pies too

(cherry picked from commit f125dda6774331be50741e91304ac794a797a1ae)
2025-07-17 14:48:35 +10:00
Plykiya
0baa814a01 Makes portable flashers destructable (#29564)
Makes portable flashers destructible

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

(cherry picked from commit 62fcb6bd96802b2540ecee245f2797c9e7ff52f4)
2025-07-17 14:30:36 +10:00
Tayrtahn
81aad95215 Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865)
* Add fill level sprite support for equipped items

* Add fill sprites for held/equipped spears

(cherry picked from commit ed4ae1628c1fbea528dd4a320efc6fd402a7ccfd)
2025-07-17 14:30:28 +10:00
Tayrtahn
0025b83b39 Add support for HeldPrefix to SolutionContainerVisualsSystem (#28532)
(cherry picked from commit 0d864d324cd0ca06e06484b38eadd8ea5c06ef5b)
2025-07-17 14:27:41 +10:00
slarticodefast
6d36a63f6c Fix EmbeddableProjectileComponent and ThrowingAngleComponent interaction (#30112)
* fix embeddable offset with throwing angle

* number

(cherry picked from commit eaace152aeb30622849826572f2aab62f5575d3a)
2025-07-17 14:27:40 +10:00
Plykiya
b567188b9c Add execution component to all energy sword weapons (#30909)
Co-authored-by: plykiya <plykiya@protonmail.com>
(cherry picked from commit c688da00a0ff5ef41c1177410ddd520037d306db)
2025-07-17 14:22:05 +10:00
Jonathan Argo
538d620b44 Made musket wieldable. (#29910)
* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.

(cherry picked from commit 00a2c6a234d7b4bae7895161c9ce0c6892d5514c)
2025-07-17 14:17:27 +10:00
Errant
648b2a6d2f Wrong magazine popup (#29046)
* wrong magazine

* a single typo

* removed GunSystem solution

* magazine misfit warnings

(cherry picked from commit eb861d173fb9bf1f105b0d0c7db6d663464f7975)
2025-07-17 14:17:02 +10:00
RiceMar1244
cbf9a6ee7d Fixes oversight in wieldable smg accuracy (#27907)
(cherry picked from commit 5da04e1cfc040a40bce0a6178b3143a7a36c02c8)
2025-07-17 14:05:38 +10:00