Commit graph

37127 commits

Author SHA1 Message Date
beck-thompson
cb8cee5ea3
Cleanup DangerousAction (#44825)
cleanup
2026-07-21 07:37:37 +00:00
Whatstone
689072e629
Add AppearanceComponent to BaseFoldable, remove from simple inheritors (#44793)
* add Appearance to BaseFoldable

* simplify Foldable instances

* no wheelchair appearance

* Move foldable.yml to the objects dir, cleanup
2026-07-21 05:58:45 +00:00
Princess Cheeseballs
2d9eb843d3
Custom DamageThreshold Serializer (#44798)
* i shitted

* fsasfaasffasfsafsafsafsafsasfasfa

* typo

* remove TODO that I forgot about

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-07-21 05:44:55 +00:00
ProPeperos
db20bceba0
Firehelmets have small power cell now (#44811) 2026-07-20 22:20:53 -04:00
riccardi48
9c6e65e855
Stack system tweaks (#44662)
* init

* oops

* changed order of TryMergeStacks

* cleanup

* tiny optimization

* documentation

* clean up

* popup

* flip args back

* bit more docs

* re-added popup

* move to prototype

* fix

* animation should always play here

* update after merge conflict

* review requests

* small tweak

* fix

* Update SharedStackSystem.cs

* spelling

* Revert "move to prototype"

* review requests

* docs

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
2026-07-21 00:14:17 +00:00
AndrewFenriz
887835018c
Vehicle system: Mech & CardboardBox Integration (#43532)
* Part one of Vehicles

* Also we need this

* Part 1

* Part 1.1

* And we need this

* Part 2

* Part 2.1

* We REALLY need this

* Part 1 of integration

* Little fix

* Just fixes

* fixes (i'm tired)

* fix

* fix

* Apply suggestions from code review

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* update

* fixed

* just for cleaner diff

* just in case

* I think this might be cleaner

* fix

* fix

* upd

* upd

* fix update

* small fix

* upd

* fix test?

* fix?

* remove initialize

* move attack to vehicle

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
2026-07-21 00:14:11 +00:00
qwerltaz
0cb461a510
Fix @name highlights not omitting your name in deadchat and admin chat. (#44815)
* Revert "fix name highlighting in deadchat (#44777)"

This reverts commit ea848108b7.

* fix @name in dead and admin chat

* add LOOC for clarity
2026-07-20 19:38:51 -04:00
Whatstone
887e80fd08
Bugfix: Fix some spawned entities parenting to vehicles. (#44764)
* SpawnAtPosition gaming

* SpawnAtPosition gaming: gun edition

* spawnnexttoordrop, restore unused gun dep.
2026-07-20 18:29:08 +00:00
AndrewFenriz
5c019004ed
Split uplink catalog into category files (#44806)
* categorize yml

* categorize ftl
2026-07-20 18:20:54 +00:00
mq
4a50966c80
re-allow humans with non realistic eye colors (#44809)
adjust eye randomization
2026-07-20 14:28:14 -04:00
Ser11y
fbb3c79b2d
Fix loc key, spelling in the AI restoration console (#44778)
* Fix localization, spelling

* empty
2026-07-20 09:53:51 +00:00
AsnDen
b3cc7a5e54
WarpPoints are localizable now (#39319)
* WarpPoints locale

* string

* Revert "string"

This reverts commit 0148e4193dafce43f793da1f3306b6246d602824.

* Mothership Core

* fix

* merge fix

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
2026-07-20 09:44:09 +00:00
Jessica M
1499090775
Remove gateway system (#44428)
* remove gateways

* oasis

* dude i swear my cat walked on my keyboard

i dont have a cat
2026-07-20 09:01:31 +00:00
John
b2c5ac13dd
added missing items to chameleon kits (#44789)
* added missing items to cham kits

* Fix whitespace

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
2026-07-20 05:44:21 +00:00
Whatstone
64ba77f13c
Bugfix: Fix shuttle airlock construction parent (#44794)
fix airlock rotation
2026-07-20 00:04:53 -04:00
Hitlinemoss
69ea0d6fa3
Assorted tweaks to several crates and cargo orders (#42712)
* Rework internals crates into the emergency EVA crate

* Order sprite change

* Order sprite change fix

* Combined the armor crate and the helmet crate

* Security crates fix

* Security crates fix again

* Removed security supplies crate

* Merged vial supply crate into chemistry supplies crate

* Removed durathread from textiles crate, renamed to 'cloth crate'

* Move raw bar/kitchen supply crates from Food tab to Service tab

* radiation protection crate no longer contains vodka

* Migrated vial crate to null

* Armor crate price adjust

* Whoops, merging master accidentally duplicated the bakemore crate

* Drum kit fix + Janitorial tab

* Janitorial crate prototype renames

* Moved janitorial crates to their own file

* Relocated BoxMousetrap

* Removed boxes crate

* Re-added security supplies crate entity (NOT the cargo order)

* Minor capitalization fix

* Moved EVA/jetpacks/shuttlestuff to 'Space' tab

* Category typo fix

* Fixed salvage restocks being in the Engineering tab

* Fixed janitorial cargo gifts using old prototype names
2026-07-19 22:36:38 -04:00
KeTuFaisPiKiNut
b587d28e41
Wizard Guardian (#44624)
* stub

* Update meta.json to indent

---------

Co-authored-by: nomdéraisonnablementlong <you@example.com>
2026-07-20 00:32:16 +00:00
qwerltaz
ea848108b7
fix name highlighting in deadchat (#44777)
fix name highlighting in deadcchat
2026-07-19 23:58:24 +00:00
psykana
ad60a5a5a5
Predict gas filter and mixer BUIs (#43712)
* move

* NetworkedComponent

* anchor

* split

* move

* mixer

* fix

* builds

* I forgor

* moar

* filename typo

* fix admin log

* ftl

* metadata

* IOC readonly 2

* yet another IOC readonly

* new features

* test I fix you

* review 1

* review 2

* docs
2026-07-19 23:50:39 +00:00
Hyper B
e26ed1fe30
Make Spanish accent more linguistically accurate (#38249)
* Update SpanishAccentSystem.cs

Use RegEx in accordance with the phonotactics of the Spanish language.

* Allow SH

* Addressing review comments

* better comment

* conflict

---------

Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
2026-07-19 23:41:41 +00:00
Pok
e7897d76a4
More item status (#39264)
* more-item-status

* update 1

* update 2

* Update pistol.yml

* update 3

* yml

* oops

* BatteryItemStatus

* fix ChargeItemStatus

* Update item-status.ftl

* review update 1

* review fix 1

* Update BatteryInfoSystem.cs

* Update TimerTriggerItemStatus

* merge fix

* merge fix

* review update 2

* review update 3

* fix marge

* StyleNano

* review update 4

* review update 5

* BatteryItemStatus

* BatteryItemStatus Client

* code cleanup

* merge

* merge and GasTank fix

* Merge

* unnecessary components

* review

* oops

* GasTank

* wawa
2026-07-19 23:41:09 +00:00
Hitlinemoss
634709d327
Survival boxes are smaller and contain no food (#41664)
* Cleanup of circuit tote / stamp box prototypes

* New BoxCardboardSmall abstract prototype, stamp box uses this as a parent now

* Removed stamp box whitelist

* Whitelist fix

* We love scope creep! Small cardboard boxes are a general thing now.

* Box description updates

* Box description updates 2!

* Prototype order cleanup

* Comment updates

* Desc touchup

* Review updates

* StorageFill -> ContainerFill

* code  comment update

* decapitalized labels

* Code comment update

* Whoops! Forgot to update one ContainerFill to EntityTableContainerFill when fixing merge conflict

* Whoops! EntityTableContainerFill items were all formatted wrong

* Departmental box names

* Misc fixes

* Survival boxes are smaller and contain no food

* Whoops, forgot mimegrations

* Fixed survival boxes

* Improved descriptions + bog of hugs name fix

* Suffix tweaks

* Parenting fix

* Updated military survival boxes to match other survival box changes

* Ninjas/Wizards once again use 3x3 survival boxes with food and water

* Whoops, wrong parent name

* Update to wizard survival box prototype

* update currentLabel to localizedLabel

* Removed labels from survival boxes in favor of names

* Box of hugs cleanup

* Adjusted migration to avoid BoxHug being unmappable
2026-07-19 22:37:31 +00:00
InsoPL
1f9ec94574
Recycler is backwards (#44383)
* cleanup

* fix
2026-07-19 22:26:47 +00:00
ShadowCommander
2cfc6f1988
Replace usages of AttachToGridOrMap with TryGetGridOrMapCoordinates (#27951)
* Rename TryGetMapOrGridCoordinates to make it clearer it gets grid first

* Replace AttachToGridOrMap with spawning directly to map or grid

* Fix a typo

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Remove uneccessary attachment

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Force full test refresh

---------

Signed-off-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
2026-07-19 22:18:50 +00:00
AsnDen
710ce734c2
Trash bag of holding and lil trash bag change (#39416)
* trash bag of holding

* recipe and research

* Janicart can store trash bag of holding

* Update janicart.yml

* Update migration.yml

* TrashBagBlue tag to janicart slot whitelist

* remove unused locale

* TrashBagHolding tag

* janicart trash bag of holding sprite

* rearrange layers so mop is above bucket

* blue trash bag to holding trash bag

* rename tag

* move trash bag to hands
2026-07-19 20:50:50 +00:00
Joshua
33216d27c8
fix: fake mindshield implant pop-up (#43100)
* #43060

This update triggers a pop-up for only the user. The pop-up tell the user if the mind shield is enable or disable. Making it clear if you were using the fake mind shield.

* Update for Fake mind shield

Makes the pop-up a function that that it can be used in two places.
The pop now works in chameleon set with the controller

* Address comment

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Convert to Entity<FakeMindShieldComponent>

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Modern subscription

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Streamline logic

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Alphabetize deps

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Simply popup

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Docs

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Allow chameleon clothing to set the pace
Also resolves ordering of set and show.

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Make mindshield popup directed (oops)

Signed-off-by: Connor Huffine <chuffine@gmail.com>

* Add exit after first action is handled

Signed-off-by: Connor Huffine <chuffine@gmail.com>

---------

Signed-off-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
2026-07-19 20:49:25 +00:00
Pok
92ee7e721b
Accents Relay Fix (#44768)
* accents-fix

* Update InventorySystem.Relay.cs
2026-07-19 20:08:50 +00:00
Connor Huffine
f4b0c9f8fd
Fix docs typo (#44782)
Update SharedPopupSystem.cs
2026-07-19 16:11:21 -04:00
sennythesnek-boop
3d9a18a43c
Fixing fixture sizes for kitchen, throwing knife and butcher's cleaver (#44780) 2026-07-19 18:58:27 +00:00
Ser11y
40ca2c7f90
Localize several search bars in the UI (#44776)
* Localize several search bars in the UI

* oops
2026-07-19 15:59:56 +00:00
Ser11y
f406a664b6
Use localized thermomachine name in Examine (#44775)
localize thermomachine's name in Examine
2026-07-19 15:52:28 +00:00
Whatstone
f63a5d2a59
Add lock visuals to the fireaxe and shotgun cabinets. (#44388)
* add wallmount cabinet lock visuals

* Different shapes to unlocked/locked lights

* scoot shotgun sprite unlocked over by one

* a little convention adherence, as a reat
2026-07-19 15:09:26 +00:00
slarticodefast
f3cff7bb8c
Revert "Directional visibility for wall-mounted entities" (#44770)
Revert "Directional visibility for wall-mounted entities (#43476)"

This reverts commit c17429daa4.
2026-07-19 15:00:34 +00:00
ProPeperos
63765280a3
Plasma Station - Modernazied Atmos and other tweaks and fixes (#44660)
Hmmm yummy plasma
2026-07-19 11:25:44 +00:00
B_Kirill
c17429daa4
Directional visibility for wall-mounted entities (#43476)
* Directional visibility for wall-mounted entities

* Fix cache

* Revert

* InteractionIgnoreAnchoredInTileComponent + yml

* Main system

* Move it

* Directional arrow

* Add fade

* retry

* Split "Directional arrow"

* fix

* small thing

* Split "InteractionIgnoreAnchoredInTileComponent"

* correct description

* I hate the online editor

* retry

* ...

* Apply suggestions from code review

Co-authored-by: Jessica M <jessica@jessicamaybe.com>

* Additional comment

* cleanup

---------

Co-authored-by: Jessica M <jessica@jessicamaybe.com>
Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
2026-07-19 04:42:51 +00:00
mq
09eb5d525e
Randomized Markings (take two) (#38528)
* preliminary porting

* weighting

* cleaning up after myself

* literally forgot to include this. oops

* apply more defaults and fix oversight that guaranteed humans would always be bald

* skincoloration

* did not actually mean to include vox in there oops!

* bugfix & performance

* macrocosm edits

* my yaml slop

* clean up some stuff i missed

* OOPS!

* ah fuck that should be further down shouldnt it

* yo mama

* req changes

* req changes 2

* yo mama

* my joker moment

* fixes

* move shit to engine

* wtf how did you get in there!!!

* array

* my dante's hell cosplay

* schmoovin

* adding portfiend cologne

* yep

* god dammit

* oops again

* uno mas

* req changes

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>

* fix clamping logic

* test fix

---------

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2026-07-18 23:45:01 -04:00
Varen
e219e1ad3c
Change dual-port air vent to function like a regular vent (#38941)
* Changed dual-port air vent to function like a regular vent for atmos purposes, removed device link
Added sprite to show direction of flow

* Fix wrong line in yaml
2026-07-19 01:32:33 +00:00
Absotively
00ed1bb44c
Battlecry UI improvements (#40337)
* Battlecry UI improvements

* Remove unneeded HorizontalExpand

* fix merge

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
2026-07-19 01:07:59 +00:00
Starlight991
1fa46dc7c0
Add Friendly and Hostile Slime Reactions. (#36673)
* Update biological.yml

* lower vestine amount. change slime amount to reflect changes

title

* Merge remote-tracking branch 'upstream/master' into pr/36673

* SpawnEntity

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
2026-07-19 01:07:39 +00:00
SlamBamActionman
414e64db25
Move all accents into being RelayAccentSystems, add InventoryRelayedEvent support (#43008)
* Refactor accents a little

* Fix Linter

* Make T happy

* Aaaand fix linter

* Add RelayAccentsComponent

* Update into RelayAccentSystem

* Fix unnecessary override and slurred

* Fix some spacing and formatting

* Update a comment

* Review changes

* cleaning

* partial

* aoao

* destruction

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
2026-07-19 00:51:54 +00:00
Hitlinemoss
db0052a79b
Added obsolete borg-module entity prototypes to migration.yml (#44749)
Added removed borg-module entity prototypes to migration.yml
2026-07-18 20:55:12 -04:00
Hitlinemoss
5b9a6925b3
Added "Assistive items" loadout group (#41264)
* Added 'Assistive items' loadout group

* Added assistive items to new medical RoleLoadouts file

* Moved AssistiveItems to be right after glasses

* removed orphaned code comment
2026-07-19 00:25:46 +00:00
Hitlinemoss
a63a9ae085
Expand and tweak several random-name datasets (#44251)
* More AI and Cyborg names

* Removed 'Head of Robots' from borg names

* Removed 'FINO' from regular borg names

* Misc. borg name touches

* 'Death Commando' name table is now split into first and last names

* Fixed deathcommando last names not working

* Added 'Biff' to deathcommando firstnames

* Added new dragon titles

* These don't need to be separate files

* Comment update (confused XINU for WINE)

* tweaks to AI/borg name lists

* More death commando names

* Tweaked AI/Borg names

* Added and organized borg names

* Added to and reorganized xenoborg names

* Operative Yankee has been hired

* More deathcommando names

* Few more deathcommando names

* xenoborg capitalization fixes

* I found Karl

* AINU wasn't in the right spot

* Deathcommando name updates

* Minor capitalization fix

* deathcommando names

* New deathcommando name
2026-07-18 21:37:55 +00:00
sennythesnek-boop
4e75cc9d7f
Changing diphenylmethylamine bottle suffix (#44760) 2026-07-18 21:37:31 +00:00
āda
d33e63a5a2
New Agent Id UI (#39769)
* icon group prototype

* prototype v2

* agent id uses groups

* working UI using groups

* UI work, new header

* formatting and misc work

* fix some texture scaling

* aesthetics

* tabs, scrollbar, MinSize

* commit

* commit

* commit

* commit

* Revert "commit"

This reverts commit 8f29ae30c69670c6dc8d5fba3dd6bd98f574830d.

* we're back

* well enough

* Final visuals for the Id (for now)

* code cleaning

* minor cleanup

* self review

* id card system changes

* try index -> resolve

* DisposeAllChildren -> RemoveAllChildren

* fix the id cards

* all pretty

* unneeded

* merge

* Review by Fildrance

* Review by Pok

* fix

* cleanup

* refactor: revert icon setsize changes back to good old '32', made container button be resizable for localization reasons

* jobIconGroup

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
Co-authored-by: Fildrance <fildrance@gmail.com>
2026-07-18 19:51:36 +00:00
Whatstone
adf6ef4f37
Hotfix: Check recipient lifecycle in StackSystem.TryMergeStacks (#44753)
TryMergeStacks: check recipient lifecycle
2026-07-18 18:55:12 +00:00
AndrewFenriz
358ecc1181
Vehicle system: Core systems & Components (#43527)
* Part one of Vehicles

* Also we need this

* Part 1

* Part 1.1

* And we need this

* Part 2

* Part 2.1

* We REALLY need this

* Little fix

* Just fixes

* fixes (i'm tired)

* fix

* Apply suggestions from code review

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* update

* fixed

* just for cleaner diff

* just in case

* I think this might be cleaner

* fix

* upd

* Update Content.Shared/Vehicle/VehicleSystem.cs

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>

* fix vehicle key and unstrap checks

* fix OnBuckleUpdateCanMove

* fixes

* clear vehicle operator relays

* small fix

* fix1

* fix2

* upd

* fix?

* fix??

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
2026-07-18 18:02:50 +00:00
Winkarst-cpu
5d80877d56
Cleanup + Fix: Unhardcode BodyType, FixtureID, and CanCollide in BeamSystem.CreateBeam (#39518)
* Fix

* Update

* Create fixture only if we can collide

* Get rid of the magic string

* Unhardcode ID

* Update
2026-07-18 17:46:26 +00:00
Princess Cheeseballs
ca2efb626e
Icon Smooth Cleanup (#44748)
* Iconsmooth cleanup

* better comment
2026-07-18 10:30:21 +00:00
Leah
41ecaa27d0
fix unhandled ArgumentException when a duplicate shop cost modifier is added (#42064)
* add map containskey check

* review

---------

Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
2026-07-18 10:11:28 +00:00