Commit Graph

10019 Commits

Author SHA1 Message Date
pathetic meowmeow ab62d18431
Give silicons PDAs (#5738)
* Give silicons PDAs

* unsaved

* borgos can have a little notification as a treat

* .Value
2026-05-09 22:19:47 +00:00
Stxcking cbbde367ba
Station Shipyard Console Works Again (#5524)
remove gridID override
2026-05-03 15:08:07 +02:00
Tobias Berger 88c84a2740
Fix blood amount for synths (#5685)
* Fix blood amount for synths

* I just forgot to keep typing the comment like frfr

* tpyo
2026-04-30 10:30:32 +02:00
Vape d4daae93e3
Port: Nuclear Reactor (#5474) 2026-04-26 21:34:23 +00:00
Field Command 2701ccb5f5
DV Escape Pods (#5536)
* DV Escape Pod

* Small update
2026-04-15 20:30:22 -05:00
Sir Warock dabe163385
Hotfix for Telepathy (#5674)
Fix it
2026-04-15 21:22:17 -03:00
Gavreau d81024d883
Psionic Refactor (#4788)
* Refactoring

* Last PR

* forgot to switch

* Redone Psionic System

* more refactoring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Another refactorio

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* I don't know why I tried to overcomplicate this I could have just made it a popup message from the start instead of wasting three hours

* another big refactorio

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update lighthouse.yml (#4849)

* Pebble hotfix 1: Added ore processor (#4874)

* Added ore processor

* Forgot grills

* Automatic changelog update

* Terra: The Holiday Episode (#4843)

SNOW

* Automatic changelog update

* Academy 1.3.0 (#4863)

* * make festive for winturrr
* fixed emergency light in viro checkpoint
* fixed always on light outside dispo

* fixed light

* Map Edits: The Hive (#4887)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Map Hotfix: Tortuga (#4878)

* Map Hotfix: Tortuga

* invalid

* Circuit imprinter

* increase detective 1->2

* return of the circuit imprinter

* fish power

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* And another one!

* Fix yaml linter

* Fix mapping section in CONTRIBUTING.md (#4894)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Give dummy avali and chitnid moth eye sprites (#4884)

1 commit ops

* Midpoint Festive Season (#4891)

* Midpoint Festive Season

* Made frosty lights not be powered by festive magic

* Automatic changelog update

* Make pride clothing be able to chameleon into similar pieces of pride clothing (#4845)

* Expedite gender reassignment (#36894)

* Remove Misgendering (#40425)

fix misgendering

* make pride scarfs and cloaks chameleon

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add missing comments

* Attempt Toby's suggestion: rename chameleon stuff

* rename the chameleon verb & window

---------

Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* kill speedboots (#4883)

* remove speedboots

* no more reverse engineering

* Update Resources/Prototypes/Research/civilianservices.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>

---------

Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Centcomm roles QOL (#4880)

* first commit yippee

* ERT now gets centcomm implants too. Also fixes ERT not having death rattle implants

* Always bigger fi- oh nevermind (Feroxi Emote) (#4877)

* feroxi changes

Wideswing,10 pierce, tail thump, better storage of body emotes for feroxis

* Direction Changes

Removed wideswing dropped feroxi melee back to 7

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* Automatic changelog update

* Update Credits (#4897)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Add Chemical, Paramedic, and Surgeon wall lockers (#4899)

* woo wall lockers!

* chemical

* clean up

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Fix respawn timer (#4895)

* fix

* Automatic changelog update

* Demetashield epsilon part 2 (#4481)

* demetashield epsilon part 2

* bug fix

* annoucement.yml fix

* some redundant stuff removed

fix

* Make the cane loadout group include the librarian cane (#4904)

* Atmos Ops: dP Guidebook Entry  (#4906)

Atmos dP Guidebook Entry (#40194)

* Add Atmos dP guidebook

* Update Resources/ServerInfo/Guidebook/Engineering/DeltaPressure.xml

---------


(cherry picked from commit a93f6b8cdf5bdc4c0bf509e0706126eea500b531)

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

* Automatic changelog update

* Xenoarch tweaks (#4486)

* Initial glimmer change

* Added glimmer multiplier

* Adds scalar of research properly like the old glimmer system

* Left over code

* Glimmer changes for Analysis Console UI

* Accidental Namespace added

* Fixed small Math issue with glimmer values

* Fixed reference to Nyano

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml

Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml

Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs

Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Fixed Deltav comment references

Went though various files and added comments to signify where delta v changes are to the upstream code

* More DeltaV Comment fixes

Added a few more comments for DeltaV specific changes, I also removed an unused line of code, and renamed to variables for better clarity

* Commenting and moving one file to _DV

I cant read apparently and  only saw some fixes requested, here are the rest apologies

* Update Content.Shared/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/Xenoarchaeology/Equipment/Components/AnalysisConsoleComponent.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/Content.Shared.csproj

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleBoundUserInterface.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Shared/_DV/Xenoarchaeology/BUI/AnalysisConsoleBoundUserInterfaceState.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Resources/Locale/en-US/xenoarchaeology/artifact-analyzer.ftl

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Addressed issues of cleaning up a function to one that already exists, restoring an old comment from upstream, and moving localization data to _DV folder

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Update Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>

* Missed one line to bring over to _DV

* Fixed github and IDE complains about null ref

---------

Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>

* It Snew On Lady Elegance (Christmas PR) (#4903)

* Update elegance.yml

* Update elegance.yml

* those who snow

* nukes the tattered cloak for real

* Update elegance.yml

* Automatic changelog update

* Winterhouse (#4910)

Update lighthouse.yml

* Hivemas (#4898)

* Hivemas

* variantize

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* It's a Tortuga Xmas! (#4893)

* It's a Tortuga Xmas!

* ...

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Reinforced Tinted Windows (#4875)

* completion

* fix

* moved directories

* fixed

* Apply suggestion from @Toby222

Signed-off-by: Tobias Berger <toby@tobot.dev>

---------

Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Manual changelog update

* Manual changelog update

* Harpies Flightless No More! (#4888)

* Initial port of EE Harpy flying (#919)

* Added better friction and acceleration modifiers.

* Moved server's flight system to shared. I don't know why it isn't in the first place.

* Shifting things around.

* Code tweaks to make it better

* Comment fixes

* Fixed footsteps and footstep sounds

* Added a quick conditional if InitialStaminaCost greater than zero

* Removed a pop-up that wasn't showing

* Additional adjustments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed a few more systems to call the Flying system instead of the component

* Comment consistency. DeltaV comments where I made it better. EE comments where they originally had things

* YAML fixes

* Guidebook

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Removed DoAfterDashEvent

* Fixed suggestions

* Updated comment

* Added new copyright free wingflaps with proper attribution

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Appeased YAML gods

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Adds nightvision to rat kings and xenos  (#4881)

* ISeeDeadPeople

* Apply suggestions from code review

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Give custom laws to Salv Borg (#4866)

* Give custom laws to Salv Borg

Give a custom lawset to salvage borg

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* updated laws explain it better and look cleaner

Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>

* Update laws.ftl

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>

---------

Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Protect arrivals and evac from meteors (slightly) (#4820)

* Protect arrivals and evac from meteors (slightly)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* change meteor protection zone to a MarkerBase

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* xenoarch: remove impossible artifact trigger combinations (#4740)

* xenoarch trigger combination blacklists

* minor review comments

* review comments

* Automatic changelog update

* xenoarch: node scanner UI overhaul (#4814)

* xenoarch: node scanner UI overhaul

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>

* Update Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>

---------

Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Syndie borg fixes (#4913)

* Moved law boards to their own file, similar to the structure that upstream uses.

* Fixed syndicate medical borg ghost role. Moved DV lawsets.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Feroxi: Blood in the Water (#4902)

* Added shark vision to Feroxi.

* Fixed a bug if someone was holding a container of blood.

* Updated pulse time and useDelay for the pulse.

* Updated guidebook

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Cleanup

* More clean-up

* Removed vision goggles sound from ability

* Got rid of an unused namespace

* last fix I swear

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Apply suggestion from @Toby222

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Removed SharedLightSystem from SharkVisionOverlay

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Byoin TEG burn chamber edits! (#4911)

Update byoin.yml

* Automatic changelog update

* Reinforced Tinted Windows Bug Fix (#4918)

fix

* Automatic changelog update

* Vulnerable String Sanitization (Prevent `cmdlink`) (#4922)

* Fix label markup escapeing (#40600)

fix

* Sanitize NanoChat

* Escape PDA Owner/Job

* Escape ID Examine

* Early merge of https://github.com/space-wizards/space-station-14/pull/41799

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* 100% Ion resistance on Ninja Suit and Visor NVG. (#4916)

* Add NVG to visor, Ion Immunity and no EMP armor ignore

* Comments..

* .ftl from up to _DV

* Rewrote visor description.

* Remove ftl newline, forgor desc comment.

* Automatic changelog update

* AI HUD and Comms Update (#4905)

* test one

* Removed mind shield hud

* Automatic changelog update

* Syndicat ghost role description tweak  (#4889)

* final tweaks I promise.

* minor desc change requests

* typo buh

* Automatic changelog update

* Chibi update 08DEC2025 (#4914)

* omg chibi so kawaii!~ >w<

* take a wild fucking guess

* cameras, fixrotations, tilewindows

* Automatic changelog update

* Fixes coffe typo (#4930)

* Add more festive holiday clothing to AutoDrobe (#4909)

* sprites galore

* no Santa monkey

* autodrobe

* cost up

* Automatic changelog update

* EntropicDegen Fix (#4931)

lol

* Automatic changelog update

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Merge Upstream

* One refactor to rule them all (#15)

* Add xenoborg laws to ion storm chance (#41532)

add xenoborg laws to ion storm chance

* Replace (almost) all existing storage fills with entity table container fills (#41360)

* Replace all existing storage fills with container fills, adjust some formatting to accomadate

* Forgot to remove that

* I really need to spell better

* Right, those are 3x3

* Change some NestedSelectors to GroupSelectors

* Actual container fills, test fix (maybe), and a few minor formatting changes

* Fix some more mistakes

* Forgot to add to that comment

* Some parenting fixes

* Test optimisation, maybe

* Roll holiday lights instead of individually listing it

* Move eletrical toolbox to NestedSelector

* Back to entity tables (except for vending)

* More nesting (and a TODO)

* Yet another fix

* Probably shoulda done it this way originally

* Entity tables for vending restocks

* I am good at formatting

* Make added table names consistent

* Make grand lottery weights a little more readable

* Use existing fills for bio suit crates

* Get rid of some more redundant amounts

* Nuke the StorageFill test section and update some comments

* Apply changes from code review

* Split off changes to vending restocks

* Split off changes to vending restocks

* Apply more changes from code review

* Attempt #2 of detangling this mess (oh shit I missed the pin)

* They look so similar

* I am great at formatting

* Missed a newline

* How did I manage to do that

* Move toy in FoodMealHappyHonkClown to top to prioritise

* Apply changes from review and move dank pizza to organise by weight

* Replace all storage fills with entity table container fills

* Balloons now float and slide smoothly. (#41102)

* The balloons became airy

* Attributions + Sound

* Add BaseBalloon

* Proto fixes

---------

Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>

* Add Whitelist.Components yaml valiation (#40916)

* Add Whitelist.Components yaml valiation

* poke_tests

* fix linter

---------

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

* Remove blacklist methods in EntityWhitelistSystem (#40932)

* replace blacklist methods

* VS is trolling me

* Remove blacklist methods from fork changes

* Add test checking for multiple container fills, mark StorageFillComponent as obsolete (#41562)

add test, obsolete storagefill

* No more sub wizards in xenoborg preset (#41565)

no more sub wizards in xenoborg preset

* Fix gas filters (#41567)

fix gas filters

* Fix stunbaton component namespace (#34790)

* Fixed incorrect namespace

* .Components was weird so I removed it

* Predict powercells, chargers and PowerCellDraw (#41379)

* cleanup

* fix fixtures

* prediction

* fix test

* review

* fix svalinn visuals

* fix chargers

* fix portable recharger and its unlit visuals

* fix borgs

* oomba review

* fix examination prediction

* Fix and mark microwave time addition for BeingMicrowaved

* Fix for missing namespace in Nanochat

* Fix several systems and protos after powercell prediction change

* Fix typo in Ion Storm lawsets (#41574)

Pizzaria → Pizzeria

* Remove commented items (#41577)

* Tourniquets can now fit in medical belts (#41584)

* Fewer War Crimes (#41541)

* Fewer War Crimes

Re-colour the syndicate medical bags to not use the legally restricted Red Cross symbol and instead use the same blue cross colours as used across the rest of the game's medical symbolism.
Because no-one wants to go to the Hauge. Also consistency is nice.

* Update meta.json

* Update another meta.json

* Update meta.json again

additional detail

* Make gameticker spawn code more modular (#41588)

gameticker dospawn

* Meatball Salvage wreck remake (#41589)

Remake-Meatball-Wreck

* Update mothership again (#41491)

* add xenoborg recharging station

* it was backwards

* make it a tad darker

* touch ups

* add xenoborg blast door sprites

* update sprites

* add xenoborg blast door

* improve blast door sprite

* typo

* make it thinner

* update mothership

* moved yml lines

* updated xenoborg charger sprite

* removed unused state

* fixes to the mothership

* Fix helmet lights (#41599)

fix helmet lights

* Change thief backpack ui name and description with Component fields (#41583)

* Add new name and description fields to the thiefbackpack component and ui

* Change fields to locids, remove Title from menu.xaml, add comments to  thiefbackpackui.cs

* Helper method for get charge level (#41601)

* get-charge-percent

* review

* Adds option to whitelist or blacklist store entries based on buyer objectives (#41493)

* BuyerObjectiveWhitelistCondition done

* fix to check every buyer objective for a blacklisted objective before checking whitelisted objectives

* resolved requested changes

* forgot a line

* Update Content.Server/Store/Conditions/BuyerObjectiveWhitelistCondition.cs

* Replaced IsBlacklistPass with IsWhitelistPass

* cleaning up

* placed whitelist == null check above objective loop

* Moved empty whitelist check below foreach loop

* final cleanup i pray

---------

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

* Fix looking at verbs causing sounds or popups (#41609)

* fix verb popups

* spelling

* Properly document AtmosDeviceEnabled(Disabled)Event (#41613)

kill misnomers

* Felinase/Caninase Reagent Tweaks (#41527)

* Tweaked reagents required for recipes, increased output of recipe, lowered time of accent per unit, and tweaked chem thresholds

* tweaks

i was lazy

* product change

lazy again

* yuh

* pluh

---------

Co-authored-by: NoreUhh <noreuhh@gmail.com>

* Change to add shot glasses to the bartender guidebook entry (#41618)

adds shot glass to bartender guidebook

* Add StatusIcon component to MobBaseAncestor (#41624)

add StatusIcon to ancestor

* Make xenoborg round end text better (#41623)

* make xenoborg win color easier to read

* display the max number of xenoborgs and the number of crew alive in the end

* make it a datafield

* add : (literally)

* add period

* make text better

* Fix EquipmentVerbs not showing up in strip menu (#41631)

commit

Co-authored-by: iaada <iaada@users.noreply.github.com>

* Fix clientsided alerts being overwritten by server (#37033)

Initial commit

* Predict borgs (#41600)

* predict borgs

* small fix

* fix MMI item slot serialization

* fix movement speed for mothership core

* review and minor improvement

* fix resolve

* review

* predict name identifiers (#41605)

* Make Firespread logical (#41636)

* FIRE

* code comment fix

---------

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

* fix rcd overlay getting stuck for borg modules (#41648)

fix rcd overlay getting stuck

* Add water flower for clowns (#41469)

* Spray!

* Add to clown loadout

* Fix the easy things

* lot nicer

* spray update..

* Fix yaml

* fixes

* changed it to warning!

* review

* review

* sku

* multi reagent bloodstream (#41489)

* multi reagent bloodstream

* pluralize the comments

* fix TryModifyBloodLevel return logic

* now with quantity

* now with solution

* implement suggestions

* fix forensics

* minor thing

* Nevermind undo that caps matters.

---------

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

* Fork fixes for multi reagent bloodstreams

* [HOTFIX] FIX LIGHT MELEE LOGS (#41655)

God fugcking

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

* Add Changeling DNA store (#41632)

* created changeling dna currency and locale currency name

* created changeling store category, created changeling-catalog.ftl

* added store and action to Urist McLing

* found the entity

* make armblade a purchase

* comment

* created ApplyToMob datafield and applied to armblade

* ApplyToMob check in storesystem

* Update Resources/Prototypes/Catalog/changeling_catalog.yml

---------

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

* Fix Damageable API (#41657)

Fix damageable api

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

* Add debug hitscan weapon (#41658)

* debug gun

* predict

* fix AI battery alert (#41879)

* fix AI battery alert

* fix copy paste error

* Fix rigged power cells exploding early (#41813)

* fix riggable

* fix

* Unify BatteryComponent and PredictedBatteryComponent (#41867)

* unify

* cleanup and merge conflicts

* floating points

---------

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

* Downstream fixes for battery unification

* Fix xenoborg modules (#41625)

* change name from heavy laser to laser cannon

* fixed some ids

* fix name and description

* change cost of upgrade modules

* remove unwield penalty

* commentary

* change name of scout modules

* same firerate as before

* typo

Co-authored-by: āda <ss.adasts@gmail.com>

* new line at end of file

* duplicated

---------

Co-authored-by: āda <ss.adasts@gmail.com>

* Only run StationPowerTests over stations in DeltaV

* Five bounty arbitrage fixes (#41846)

* commit

* tweak

* more bounties

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>

* Stop the laser gun bounty allowing LaserTag guns

* Fix power draw on Defib cabinet when not charging anything

* Mail Cart (#41482)

* Add mailcart crate type

* Add recent progress, move location of mailcart.rsi

* Allow letters and packages to be inserted

* Add updated sprites for mailcart

* Add storage for letters

* Bugfix for sprite

* Add fix for mincount mailcart sprite updates

* Add dynamic names to packages in mailcart

* Add additional whitelist items

* Update tag comments

* Remove max item size

* Update fixture for mailcart, remove unused code from crates.yml

* Add mail cart to cargo ordering

* Update meta.json

* Remove unused comment

* Update copyright

* Add missing ContainerContainer

* Update ContainerContainer

* Revert "Update ContainerContainer"

This reverts commit 1805dcd58d8c0f52baca9db0d3173940ee241159.

* Remove container slots and increase storage

* Remove unused tags

* Remove LetterDelivery tag

---------

Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>

* fix solution contents duplication on spill behavior (#33231)

* I’M SCREAMING INTO THE VOID AND IT’S NOT LISTENING

* review

* explodes pancakes with mind

* graaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Meteors RAAAAAAAAAAH

* I'm so tired of solutions

* whhop

* revert

---------

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

* Disable xenoborgs at roundstart

* Fix issue with weaponUids not being passed correctly for weapons used by entities

* Upa APC max load to 40 kW

* Use existing hardsuit extra table

* Move xenoborg lawsets above DeltaV

* Apply #41583 to all thief stash-like entities

* Also apply #41149 to all magazines and ammo boxes

* 1984 engineering holoprojector

* change to 6 charges

* Security longcoat resprite (#5288)

* My coats are so long

* making the hos longcoat more hoslike

* Automatic changelog update

* Printable plasteel (#5284)

* Printable plasteel

* Actually make it a bit faster

* Move to that other recipe pack

* Recipes are named after their result

---------

Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Disable Wizard until Rebalanced (#5228)

* Remove wizard from midround antags until rebalanced

* Removed wizard from roundstart antags

---------

Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* Automatic changelog update

* Apply #41461 to _DV security borg modules

* Tank Dispenser Recolor (#5267)

* Add files via upload

Tank Dispenser Recolor

Signed-off-by: Thingy461 <darmentici@gmail.com>

* Add files via upload

Minor tweak to vending machine YAML for tank dispenser recolor

Signed-off-by: Thingy461 <darmentici@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix line endings

* Apply suggestions from code review

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Apply suggestion from @ShepardToTheStars

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* epic grammar ops

* hotfix-plasteel (#5298)

* Automatic changelog update

* Make unholy water actually have a color (#5312)

make unholy water actually have a color

* Tiny things not worth requesting changes for

* Changelog stuff!

* Merge pull request #5293 from Pharaz4/cherrypickattempt

LIZARDS GET TAILS ON HARDSUITS!!!

* Automatic changelog update

* Remove Syndie comms from disaster victims and guards (#5280)

* remove syndicomms from disaster victims

* removed from syndicate guard as well. (dropship ruin has a guard)

* fix harpy wing showing on cc hardsuit

* Automatic changelog update

* Halve Space Law Sentencing Times (#5249)

* Reduce times in space law and SOP, in guidebook and wiki

* cat c 12 minutes instead of 10

* update crime assist

* CentComm stuff (#5315)

* CentComm stuff

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* hmm...

---------

Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Add missing link in changelog

* Uncloneable in my medical scanner? Yes. (#5310)

* Update OrganManipulation.xml

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* no more taser!

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* Merge branch 'DeltaV-Station:master' into master

* MMm yummy fixes

* Adsd the UNcloneable to the scanner!

* fixing some guidebook things about the cloning

* Fixed the guidebook entry

* undone a change to splaw

* textlinkd

* COMMENTS RAHHHHH

* Update CryoPodSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>

* Update HealthAnalyzerSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>

* Update HealthAnalyzerSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>

* Automatic changelog update

* Health Analyzer Uncloneable Refactor (#5330)

* Partial revert of #5310

* Refactored uncloneable out of the HealthAnalyzerScannedUserMessage BUI.

* Automatic changelog update

* Centcomm fixes (#5321)

* Automatic changelog update

* epic guidebook ops

* fix EngieeringRegulations type

* minor fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Credits (#5341)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Invisible Guitar Wield Bugfix (#5331)

chec

* Automatic changelog update

* Brigmed Beret (#5333)

brigmed

* Automatic changelog update

* bandolier buff? tweak? (#5313)

ok functional

* Automatic changelog update

* Port admin logging of AAC messages (#5309)

fix: Admin log AAC tablet messages

* Automatic changelog update

* Changed enabled mapped pressure pump to 300 kpa (#5336)

lowered pressure by 10 kpa

* Automatic changelog update

* Port sneaking status icon from Lagrange (#5308)

* Make the icon for sneaking show sneaking status (#358)

* Make the icon for sneaking show sneaking status

* Specify sprite

(cherry picked from commit dd5fa91e1e1b9f350f7dac15579430d503b2ab6b)

* Update from review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>

---------

Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* Updates random solar panel spawner (#5323)

* Updates random solar panel spawner

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/solar.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>

---------

Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* feat: Add a few bowls to the perma chefvend (#5304)

* Automatic changelog update

* The Reclaimer MK2 returns! (#5245)

* The Reclaimer returns

* Added the ability to name GridSpawns with a specific name

* formatting

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>

* Automatic changelog update

* Midpoint Updata: CC now have an office on Midpoint (#5231)

* Midpoint CC

* Update maps.yml

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed spelling!

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Feroxi Wagging (#5319)

* uno

* fix

* fml

* mark 2

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Fix harpy ERT, CC, suits (#5325)

* Fix harpy ERT suits (not elite ones, change enabled mapped pump from 310kPa to 300kPa.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix harpy suits not working (probably)

* fix the harpy suits not displaying

* Fixed Lizards missing a sprite for the rhino hardsuit, also some minor comment adjustments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Hid upstream ERT spawners

* added 3 sprites for reptiles

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix firesuit (And its namespace)  and add rd suit sprite for lizards

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* elite ert sprites because toby hasnt reviewed yet

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* still not merged so im adding this, will fix debug test failing on prs

* fixed attributions

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Emagnum patch (#5352)

* Update projectiles.yml

* Now that I’m thinking about it giving it opaque could lead to unintended interactions

* Apply suggestion from @ShepardToTheStars

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Update Credits (#5356)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Small Pebble fixes (#5347)

* Small Pebble fixes

* Small pebble fix

* Automatic changelog update

* Byoin and Basu update (#5232)

* Byoin and Basu update

* Byoin Fixes

* more small edits.

* minor fixes

* Automatic changelog update

* Shoko update (#5334)

* Updayed shokou to modern standard, see pr for more info

* changed stuff based on feedback in discord

* added mailing unit between botany and chem. fixed window in bathroom. added to the 4th wall breaking note in station anchor.

* fixed mail unit placement in botany

* added drain to salv airlock and disposals. redid parts of epistemics. redid perma bathroom and removed condiments. added colors to atmos pipes and changed up the pipe layour of distro and waste. added firebot to teg room.

* added salvage job board to salv dock

* made changes based on feedback from FC

* fixed missing change

* Automatic changelog update

* Map Hotfix: The Hive (#5368)

* Map Hotfix: The Hive

* switcheroo

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Hotfix: Obliterated the second LO locker on Pebble (#5371)

Obliterated the second LO locker

* Automatic changelog update

* adds 4 new ruins based off of /tg/ stations space ruins. (#5283)

* adds 4 new ruins based off of /tg/ stations space ruins.

* fixed up window missing a grille and made mines a 33% chance to spawn instead of garuntee

* Automatic changelog update

* Update Credits (#5383)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* the fabled single line change

* Update PlayerProvidedCharacterRecords.cs

* Revert Soretizone buff (#5307)

* Update medicine.yml

Update medicine.yml

Update medicine.yml

Revert "Update medicine.yml"

This reverts commit 905c5cac07.

Update medicine.yml

* Update medicine.yml

* agono make you numb also

* condenser power usage change (10kW ->2kW) (#5365)

* Auto label port

* Make it so it works/comments

* Post review changes.

* Post review change part two.

* review pt 3

* Fixed client UI from not getting updated.

* Gas condenser power usage to 2k

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>

* Automatic changelog update

* shoko update numba 3 (#5401)

* shoko update numba 3

* 88 LINES ADDED 82LINES REMOVED

* Automatic changelog update

* Fix pew sprite, benches, and make these benches constructible. (#5375)

* fix pew sprite, fix incorrect labelling of benches and sofa, add snapgrid center to benches

* make it so you can construct/deconstruct and relocate namespace

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add migration

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Fixes to suffix (#5353)

* Reverts Arena weapon spawner change (#5322)

Reverts change from prob to weight

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Removed a dead pixel on a book sprite (#5362)

* Update Credits (#5413)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Hotfix: Pebble, small changes. (#5415)

Pebble fixes

* Automatic changelog update

* Lighthouse Tweaks... again... (#5246)

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Automatic changelog update

* old_infiltrator hotfix (#5405)

* oldinfiltrator hotfix

* put command corpse spawner and add exception for cc loot to the infiltrator ruin

* fix wrong file path

* webedit

Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* fuck github

---------

Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* Removed ability for limbs to be trashed

* removed bodyparts ability to be placed in trashbag

* Removed estoc slowdown (#5242)

* Removed estoc slowdown

* Re-added speed penalty, but reduced to 0.9x instead of 0.75x

* Automatic changelog update

* Adding purifying salt to the med vend, and a new cryo chem for holy and shadow (#5276)

* new cryo chem and adding topicals to medivends and med's techfab

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* me when dumb and tired and on phone

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* woof

* Update Resources/Prototypes/_DV/Recipes/Reactions/medicine.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* Update Resources/Prototypes/_DV/Reagents/medicine.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* ok maybe that fixes it if not will look at later

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* did the />

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

---------

Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Automatic changelog update

* Asterisk fix (#5373)

* first part

* last one

* last

* last one maybe

* last fix

* Automatic changelog update

* Academy 1.6.0 (#5412)

* boxketball court is wooden again
* gave botany a window and moved their machines around, extra crate, extra tools
* added masks to clown and mime rooms, someone complained "it's barren"
* fixed hop diectional sign above robo
* added crashcart to med and viro
* added mailcart to mail
* converted maint passage to hallway between epistemics and cargo, and updated directional signs
* removed christmas cakes from kitchen and cargo cafe
* replaced winter with spring/summer
* added gold and silver to cargo

* Automatic changelog update

* Automatic changelog update

* add emoting component to skia (#5366)

* Automatic changelog update

* Fix shrapnel landmines not triggering properly (#5379)

* Fix shrapnel landmines not triggering properly

* Re-enable landmines in the landmine entity table

* Automatic changelog update

* Make the chemvend's bluespace beaker only available through an emag (#5392)

* move the chemvend bluespace beaker to emaggedInventory

* forgot to commit

* Automatic changelog update

* removing machine pistol mag compatability for the viper and pollock and fixing practice mags (#5296)

* sighs

* :3 oopsie daisy,,,,,

* adding the thingy

Signed-off-by: keekee38 <iamabanana372456@gmail.com>

* Fix comment

Signed-off-by: Stop-Signs <stopsign221@gmail.com>

---------

Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>

* Automatic changelog update

* New Gun Safe Sprites (#5314)

* Automatic changelog update

* Automatic changelog update

* Automatic changelog update

* infested frigate ruin fix (#5431)

* Automatic changelog update

* Merge pull request #5218 from DisposableCrewmember42/conspirator-port

feat: add Conspirators from Harmony

* Automatic changelog update

* Slavic Accent character trait (#5264)

* port slavic accent

* change some replacements

* bobr

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* eliminate redundant regex

* bozhe moy

* order matters

* Merge branch 'master' into slavicAccent

Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* Update Content.Server/_DV/Speech/EntitySystems/SlavicAccentSystem.cs

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>

* tryfix

* Merge branch 'slavicAccent' of https://github.com/zelezniciar1/Delta-v into slavicAccent

* Automatic changelog update

* Free Suit Storage (#5300)

what fun

* Automatic changelog update

* Elegance Update Number I Lost Track (#5387)

* Update elegance.yml

* holy shit is that kris deltarune

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* dghjdsgjkdfs

* that one random brick decal under the window:

* stuff

* Kill that line 

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>

* Kill that line 2 but it's actually redoing them

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>

---------

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Crusher Right Click Wideswing (#5327)

commit

* Automatic changelog update

* Map Edits: The Hive (#5438)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Reclaimer MK2 hotfix (#5440)

Fixes #5428

* Map Edits: Arena (#5445)

* Map Edits: Arena

* AI router

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* PKA fixes try 2 (#5311)

* easier to just redo the PR rather then fix the old one

* remove comment

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

---------

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>

* Automatic changelog update

* fix: (re)remove forced accents (#5343)

fix: (re)remove clothing/item/role-forced accents

* Automatic changelog update

* Let Engineering choose their starter suit (#5317)

* test

* a lot of stuff

* Changed voidsuit speed to 15%. Added a locker variant to just have the hardsuit, with a shitty id

* test re-run

* deltaV addition comments

* goob copyright (just in case bro, don't sue us)

* Automatic changelog update

* Add new Lobby and Jukebox music by Darklyac (#5424)

* darkylac muisic real

* the time

* Automatic changelog update

* Add cloth wraps (#5335)

add cloth wraps

* Automatic changelog update

* Borg Crew Monitor Fixes (#5342)

* Update handheld_crew_monitor.yml

* suggested clarity

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Automatic changelog update

* Update Credits (#5453)

Co-authored-by: DeltaV-Bot <github@deltav.gay>

* Edge fix (#5439)

* Edge

* Edge Part two

* Edge final

* Automatic changelog update

* move bluekies to DV namespace (#5414)

* move bluekies to DV namespace

* FIX FAIL

* fix harpy paramed suit

* Automatic changelog update

* Remove ballistic reflect from energy swords (#5429)

* reduce reflect chance on ninja and cult swords  Energy weapons by default now only reflect energy projectiles

* Revert "reduce reflect chance on ninja and cult swords  Energy weapons by default now only reflect energy projectiles"

This reverts commit 444d9a4921.

* Energy swords only reflect energy shots

* Enable wizard's teleport scroll and wizard's den map (#5215)

* Enable wizard's teleport scroll and wizard's den map

* mapPath

* longer cable in cave

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* add blacklist to cigpackbase for chems (#5402)

* add blacklist to cigpackbase for bottle and vial

* hold up i forgot half the shit

* Automatic changelog update

* Tweak the Health Analyzer Triage System  (#5110)

* guh

* applied suggestions + made medical access only

* Automatic changelog update

* Minor Rat King Tweaks (#5326)

* baby rat king tweaks

* requested changes

* Automatic changelog update

* Port over Funky's unary pipe layers (#5372)

* port over funkies unary layers and put them under _funky namespace

* fix construction thingies having names that cause yaml linter to fail

* why does yamllinter not show errors on my machine

* Apply suggestions from code review

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* addd attributions

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* add attributions 2

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* add attributions 3

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>

* Update Resources/Prototypes/_Funkystation/Entities/Structures/Piping/Atmospherics/alt_layers.yml

Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>

* Automatic changelog update

* Hos Aura Buff (#5425)

* that should do it

* copyright update

* more work done

* Rename Icon.png to icon.png

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* Automatic changelog update

* Map Edits: Tortuga (#5437)

* Map Edits: Tortuga

* Additional changes

* Passive vents

* oh yeah

* review fixes

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Submarine Fixes (#5394)

MASS UPDATE

* Automatic changelog update

* Map Edits: Evac Shuttles (#5457)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

* Automatic changelog update

* Lighthouse Arrivals (#5419)

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Update lighthouse.yml

* Automatic changelog update

* Update division.yml (#5465)

* Terra Hotfix 4 - It's Alive! (#5432)

* Terra Hotfix 4 - It's Alive!

* Removed all bombing targets from warp points

* Renamed Vault substatin, extended cargo dock, added AI restore to AI Sat, changed arrivals screen

* Automatic changelog update

* fix missing exception on lavaland ruin (#5472)

* Elegance Engineering Crates Hotfix (#5468)

* Update elegance.yml

* Update elegance.yml

* Update elegance.yml

* Automatic changelog update

* Merge Upstream

---------

Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: Samuka <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Hohenzolaren <153686236+ReWAFFlution@users.noreply.github.com>
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Jessey van Hoeijen <114107545+LMSNoise@users.noreply.github.com>
Co-authored-by: Stefano Pigozzi <me@steffo.eu>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: CDWimmer <31413434+CDWimmer@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: NoreUhh <85219416+NoreUhh@users.noreply.github.com>
Co-authored-by: NoreUhh <noreuhh@gmail.com>
Co-authored-by: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Noah Beverly <noahbeverly@gmail.com>
Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Co-authored-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Co-authored-by: Thingy461 <darmentici@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com>
Co-authored-by: Theo <rebe83a@gmail.com>
Co-authored-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DeltaV-Bot <github@deltav.gay>
Co-authored-by: verybigman <171044200+verybigman311@users.noreply.github.com>
Co-authored-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
Co-authored-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: marigauge <thesaiyandude3@gmail.com>
Co-authored-by: MD360 <74264906+MantasDab360@users.noreply.github.com>
Co-authored-by: Katie <Katiethekater@gmail.com>
Co-authored-by: turtlemutt <wolfybriggan575@gmail.com>
Co-authored-by: Hamey <jhammett3229@gmail.com>
Co-authored-by: Woljif <243318409+Woljif@users.noreply.github.com>
Co-authored-by: snowywinters <134970424+snowywinters@users.noreply.github.com>
Co-authored-by: biddygelson <4606269+Calis007@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: Cepelinas1 <kakelis01@gmail.com>
Co-authored-by: wesker <53323309+weskified@users.noreply.github.com>
Co-authored-by: pootslap <211648338+pootslap@users.noreply.github.com>
Co-authored-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: SirrRequiem <webrules11@yahoo.com>

* Revert "One refactor to rule them all (#15)"

This reverts commit b2a2613ad7.

* fix fails

* THE LAST REFACTOR

* Fix test fails

* more test fails

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Test fails BE GONE

* small fix

* Remove Mime powers from Psionics

* Adress Initial Reviews

Co-Authored-By: BarryNorfolk <190395382+BarryNorfolk@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix csproj file

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Fix the other

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Adress other review

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Content.Shared.csproj

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Remove CSProj change

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Erase empty space

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* das

* UNTOUCH THE GODDAMN FILE

* untouch file

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Fix goidacode

* Merge fixes

* Adhere to the messaiah

---------

Signed-off-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Signed-off-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Signed-off-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Signed-off-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Signed-off-by: Thingy461 <darmentici@gmail.com>
Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Signed-off-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Signed-off-by: Madison Rye Progress <makyo@drab-makyo.com>
Signed-off-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Signed-off-by: Stop-Signs <stopsign221@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Co-authored-by: turtlemutt <wolfybriggan575@gmail.com>
Co-authored-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Co-authored-by: SirrRequiem <webrules11@yahoo.com>
Co-authored-by: biddygelson <4606269+Calis007@users.noreply.github.com>
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
Co-authored-by: ConstantlyConfused <67894661+Eternally-Confused@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: Proxy also works :3 <98499019+Proxysseia@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Dorragon <101672978+Dorragon@users.noreply.github.com>
Co-authored-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DeltaV-Bot <github@deltav.gay>
Co-authored-by: Stxcking <tamthaotran5@outlook.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Cepelinas1 <kakelis01@gmail.com>
Co-authored-by: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: SirSmith148 <64059804+SirSmith148@users.noreply.github.com>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: verybigman <171044200+verybigman311@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: BungleBoss <100389635+BunglesnortBoss@users.noreply.github.com>
Co-authored-by: MD360 <74264906+MantasDab360@users.noreply.github.com>
Co-authored-by: snowywinters <134970424+snowywinters@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Minerva <218184747+mnva0@users.noreply.github.com>
Co-authored-by: Samuka <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: SnappingOpossum <snappingopossum@outlook.com>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Co-authored-by: Hohenzolaren <153686236+ReWAFFlution@users.noreply.github.com>
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Jessey van Hoeijen <114107545+LMSNoise@users.noreply.github.com>
Co-authored-by: Stefano Pigozzi <me@steffo.eu>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: CDWimmer <31413434+CDWimmer@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: alexalexmax <149889301+alexalexmax@users.noreply.github.com>
Co-authored-by: NoreUhh <85219416+NoreUhh@users.noreply.github.com>
Co-authored-by: NoreUhh <noreuhh@gmail.com>
Co-authored-by: JackspajfMain <105893899+JackspajfMain@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Ignaz "Ian" Kraft <ignaz.k@live.de>
Co-authored-by: Noah Beverly <noahbeverly@gmail.com>
Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Co-authored-by: Pharaz4 <143268074+Pharaz4@users.noreply.github.com>
Co-authored-by: Thingy461 <darmentici@gmail.com>
Co-authored-by: Theo <rebe83a@gmail.com>
Co-authored-by: PureBreadBagel <146181383+PureBreadBagel@users.noreply.github.com>
Co-authored-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: Madison Rye Progress <makyo@drab-makyo.com>
Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
Co-authored-by: marigauge <thesaiyandude3@gmail.com>
Co-authored-by: Katie <Katiethekater@gmail.com>
Co-authored-by: Hamey <jhammett3229@gmail.com>
Co-authored-by: Woljif <243318409+Woljif@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: Stxcking <217132821+Stxcking@users.noreply.github.com>
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: wesker <53323309+weskified@users.noreply.github.com>
Co-authored-by: pootslap <211648338+pootslap@users.noreply.github.com>
Co-authored-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
Co-authored-by: BarryNorfolk <190395382+BarryNorfolk@users.noreply.github.com>
2026-04-15 22:33:57 +02:00
Tobias Berger 8aceccfb9d
Merge pull request #5316 from BarryNorfolk/merge_dec_jan
Upstream Merge (December 2025 - Jan 16th 2026)
2026-04-11 18:27:39 +00:00
BarryNorfolk 63b2eadada
[K9] Rework Grappling (#5337)
* Remove unused ProtoId

* Remove unused variable

* Move the entire of grappling into shared

* Move grappler to Secdog base to enable all secdogs to grapple

* Fix prediction on grappling from move to shared

* Also block any StandUpAttempt events

* Remove secdog hand disabling and up cooldown to 15 seconds

* Add grapple activation modes

* Implement new activation mode handling

* Allow damage accumlated to release grapples

* Add initial damage to activation mode

* Immediately refresh modifiers on releasing of grapple

* Check accumulated damage constantly, clear damage via timer

* Only emit popups from server side

* Update Laika's grappler component to use new activation mode

* Add event for entering stamina crit

* Release grapple when victim enters crit

* Minor rewording of grapple starting

* Typo

* Rely solely on the shared system for grappling now

* Change activation mode from class to interface
2026-04-11 17:35:25 +02:00
Tobias Berger 9a4e406717
Revert APC max load to 20kW (#5641) 2026-04-09 19:13:30 +02:00
BarryNorfolk 39742fda38
Fix target immune (#5386)
* Add a new filter for checking ObjectiveImmune on both the mind and players' entity

* Swap from TargetObjectiveMind filter to ObjectiveImmune filtering

* Better if statement for checking body
2026-04-07 16:38:47 +00:00
BarryNorfolk ec74175d39
Make both CosmicColossus and Skia immune to tasers (#5374)
* Add blacklisting for StunOnCollide on a tag

* Add new TaserImmune tag and apply it to BulletTaser

* Block Colossus and Skia from being tased
2026-04-07 10:23:17 +00:00
BarryNorfolk 7f8712f086
Fix IPCs losing access to radio implants when locked/unlocked (#5456)
Ensure radio implants are checked when updating channels for IPCs
2026-04-07 09:45:08 +02:00
Theo 47f8d4ddc5
removed shuttle calling ion law (#5591)
* removed shuttle calling law

* make duplicate law roll instead
2026-04-06 13:04:57 +02:00
Stxcking 2998efd4bf
Fix: Energy Gun Fire Mode Pop-up Message (#5624)
buh
2026-04-05 15:24:32 +02:00
DisposableCrewmember42 0ce8d934f4
cherry-pick: upstream's damage-dependent ghost sprites (#5516)
Ghost types  (space-wizards/space-station-14#37949)

* Empty commit

* yeah thingi

* added a GetHighestDamageTypes thingi to the DamageableSystem

* no idea why those files names are different only in github so just in case readding them

* yeah doing that

* first steps of moving the logic somewhere nicer

* still plenty to do

* gosh such a mess but getting progress done

* small fixie push

* big mess of bunch of stuff

* dealing with a conflict and fixing the random numbers

* testing if github will update now

* dealing with the other conflict

* github please update i beg you

* dealing with more conflicts

* hopefully this fixes it

* fixing conflicts again

* cleaning up stuffies

* sprite fixie

* general cleanup

* doing the small fixies first

* getting rid of the new event, gotta handle ashing next

* adding spaces to comments before i forget

* handling ashing

* think that did it?

* small fixies

* more small fixies

* last batch of quickie fixies before i gotta handle the bigger stuff

* last bunch of fixies i do understand

* small bit of progress yknow may as well yeah

* renaming and moving stuff to shared

* comment fixiees

* saving damage in a new component instead of in MindComponent

* protoid's and dict usage instead of the previously ickier methods

* small fixie before biggie fixie

* more fixies im slepy gosh

* thinkie that should fixie it

* smoothed the damage storage systeem so its less repetitive and icki and now itss cooler and i can go eepy

* lots of stuffies x3

* first step of getting git to detect my file name changes

* thinkie that should fixie it

* fixies

* just getting rid of the merge conflict, will check damageable later

* small thingies first

* more small stuffiees

* now all of the sprites have at leeast a 0

* dirtying the lastbody comp

* more fixies

* small thingi first

* another small fixie and a minor sprite fixie

* rng fixie

* moving the damage storage system to shared

* smoothing out code thats likely to be replaced soon but its good to do for now

* just showing progress bcus yis

* general progress stuffies mhm

* pushie

* small cleanup

* general progress :3

* in progress push for helpie

* proper pushie with progress and workies

* removed unnecessary usage of the storedamage component

* minor fixiees

* extra comments

* replaced a couple strings for ProtoId's

* gibbing related fixies :3

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
2026-04-04 21:39:24 +02:00
Velken d3086de6d6 Admin Anomaly Scanner (#42443)
* admin anom scanner

* improvement

* green

* sprite
2026-04-04 16:57:55 +02:00
neomoth a1ded7d6e0 Fix Zombie Resistance Probability (#42451)
free merge
2026-04-04 16:57:55 +02:00
Nemanja edd857a7a2 Fix flatpacker exploit ignoring board costs (#42445)
Fix flatpacks ignoring costs and board requirements
2026-04-04 16:57:55 +02:00
B_Kirill d4da14de28 Camera map (#39684)
* Camera map

* I hope this helps

* Review 1

* Review 2

* Review 3

* Review 4

* Review 5

* Colorblind mode support

* Review 6

* Change design

* Map wire

* Logic fix

* Fix a terrible mistake

* Fix

* Fix 2

* Small rename

* More fix

* Better removal

* And another fix

* Will it work?

* It is literally pointless

* some small things
2026-04-04 16:57:55 +02:00
Fruitsalad 036ed50b6e Cryo pod UI (#41850)
* Add CryoPodWindow (placeholder)

* Change HealthAnalyzerWindow: split off reusable HealthAnalyzerControl for cryo pod UI

* Improve CryoPodWindow: add health analyzer

* Improve CryoPodWindow: add eject button

This wasn't requested in the issue but I implemented it as practice with the UI system.

* Rewrote GasAnalyzerWindow, split off reusable gas mix viewer for cryo pod

* Change GasAnalyzerWindow: change back to three columns

With two rows you get a layouting bug when there's a lot of different gases, which looks somewhat bad. I didn't feel like fixing the layouting bug (it's an engine issue) so we're going back to three columns. That way you don't ever get two rows in practice.

* Change GasAnalyzerWindow: simplify by disabling Resizable

I added a lot of complexity to make resizable work nicely with a derived max & min size, but it's not necessary.

* Change GasAnalyzerWindow: file-wide namespace

* Change GasAnalyzerSystem: add GenerateGasMixEntry

* Split HealthAnalyzerUiState from HealthAnalyzerScannedUserMessage

* Rewrote CryoPodWindow, add atmos info

* Improve CryoPodWindow: add loading placeholder

* Improve CryoPodWindow: add internationalization support

* Fix GasAnalyzerControl: add missing translation

* Improve CryoPodWindow: add beaker info, high temperature warning

* Improve CryoPodWindow/System: inject button in window + necessary system changes

* Fix CryoPodWindow: Entering cryopod now closes window

This way you can't heal yourself with a cryopod.

* Change CryoPodWindow: add & update comments

* Change HealthAnalyzerComponent: remove `uiKey` property (no longer necessary)

* Tiny fixes

* Improve CryoPodUiMessage: replace string with enum

* Change GasAnalyzerWindow: simplify Measure code

* Change CryoPodComponent: rename Injecting to InjectionBuffer

* Change CryoPodBUI: tiny code simplification

* Fix HealthAnalyzerComponent: Removed stray import

* Improve CryoPodWindow: Prettier, concise atmos

* Improve CryoPodWindow: Chemicals bar chart

* Improve CryoPodWindow: Add Ruler to reagents

* Change CryoPodWindow: More horizontal layout

* Improve CryoPodWindow: Reduce height jiggling

The health analyzer's height changes a lot, which can be annoying with the buttons (for example when the oxygen damage label is popping in and out)

* Improve CryoPodWindow: Add setup checklist

This is mostly here to fill vertical space in the new horizontal layout.

* Improve CryoPodWindow: Eject beaker button

* Improve CryoPodWindow: Localization

* Improve CryoPodWindow: Add BeakerBarChart

An animated version of the chemicals chart

* Fix CryoPodSystem: Ejecting beaker no longer clears injection buffer

* Improve BeakerBarChart: Not animated on first frame

* Fix CryoPodWindow: Fix broken translation

* Improve CryoPodWindow: Reorder sections

* Fix BeakerBarChart: Tooltips now show up

* Change BeakerBarChart: Reorder functions

* Change CryoPodWindow: Reorder sections, change margins

* Change CryoPodWindow: Edit flavor text

* Revert changes to GasAnalyzerWindow

Since GasAnalyzerControl is no longer used in CryoPodWindow, these changes are no longer relevant to this PR.

* Tidy CryoPodWindow: Remove old workarounds

These are old layouting bug workarounds from the older version of CryoPodWindow that had a ScrollContainer in it. They're no longer necessary. Less ScrollContainers less problems.

* Tidy up: Remove unused imports

* Remove LabelledSplitBar

It was replaced by BeakerBarChart, which is a lot fancier.

* Tidy up: Tiny code style fix

* Change CryoPodSystem: Move code from server to shared

This is still without adding UI prediction

* move a ton of stuff to shared.

* one last thing

* Improve BeakerBarChart: Keep visual entry width when swapping beakers

* Improve BeakerBarChart: Respect beaker order of reagents

* Improve CryoPodWindow: Ensure space for injection buffer

 We need to keep space on the chart for the injection buffer after swapping to a full beaker.

* Improve CryoPodWindow: Prettier ejection error

* Improve CryoPodWindow: Add "Cooling patient" status

* BeakerBarChart: Fix UI scale bug

* BeakerBarChart: Fix bluespace beaker ugliness

* BeakerBarChart: Add more pod status strings

* HealthAnalyzerControl: Filewide namespace, sort imports

* Style fix: Replace `bool x = y` with `var x = y`

* CryoPodUiMessage: Split off separate class for inject

* SharedCryoPodSystem: Move message-related code into Subs.BuiEvents

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:54 +02:00
slarticodefast 9ecb979e3b Predict defibrillators and add an integration test for them (#41572)
* cleanup

* fix fixtures

* prediction

* fix test

* review

* fix svalinn visuals

* fix chargers

* fix portable recharger and its unlit visuals

* fix borgs

* oomba review

* fix examination prediction

* predict

* readd zapping interacting mobs
2026-04-04 16:57:54 +02:00
B_Kirill 14f151cc21 Cleanup warnings: CS0414 (#42429)
cleanup
2026-04-04 16:57:54 +02:00
TriviaSolari 88bba6790b Reduce unnecessary `ComponentInit` work for airtight entities (#42390)
Refactor AirtightSystem to skip rotation checks for omnidirectional blocks on init

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:54 +02:00
ArtisticRoomba a000102942 Atmos GasSpecificHeats in shared (#42136) 2026-04-04 16:57:54 +02:00
TheFlyingSentry a253b140a8 Fixed Containment Generators not updating pointlight correctly (#42289)
oh my god i've been overcomplicating this you don't want to know...
2026-04-04 16:57:54 +02:00
korczoczek 914bf8ab1c Make lathes refund materials when recipe gets cancelled (#42416)
30 day free refund
2026-04-04 16:57:54 +02:00
BarryNorfolk 669cc6f49b Downstream fixes for #42405 (Decouple gibbing) 2026-04-04 16:57:53 +02:00
pathetic meowmeow 66ddb7473f Decouple gibbing from the body system (#42405)
* Decouple gibbing from the body system

* allow gibs that don't drop giblets

* pass through user

* prediction gon

* comment

* destructible

* playpvs

* very very very very very very very minor cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
ArtisticRoomba 3f34d833fb Fix TritiumFireReaction low fuel limiting behavior (#42407)
fix fuel burn limiting logic incorrectly taking max instead of min
2026-04-04 16:57:53 +02:00
ArtisticRoomba 3a14020a2f AirtightSystem Tests (#42190) 2026-04-04 16:57:53 +02:00
Sarah C f2124ce549 Fix tritium fires breaking conservation of mass (#41870)
* i can't believe this went unnoticed for so long

* i may be stupid
2026-04-04 16:57:53 +02:00
Velken b9896377ad Allow station tiles to be placed on solid ground and other platings. (#38898)
* WORK IN PROGRESS 1

* ITS ALIVE, ALIVE!!!!

* clean up

* WIP 1

* fix small oversight

* big diff of doom

* added CVAR to tile history stack size

* component time

* filescoped namespaces + remove redundant nametag

* fix silly little mistakes

* typo

* TileStacksTest

* bweeeeeeh :P

* nuke cvar

* :3

* WIP2025

* Fix submodule

* It's beginning to look a lot like Christmas

* It's the Most Wonderful Time of the Year

* tiny fix

* fixed extra spacing on yaml

* slightly improve tilestacking test

* Part 1 out of 2 (part 2 tomorrow)

* Part 2

* add a simple tile construction test for tilestacking

* guh

* address reviews (no documentation yet)

* documentation be upon ye

* remove extra spaces

* prediction fix

* dirt

* oops :p

---------

Co-authored-by: Killerqu00 <killerqueen1777@gmail.com>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:57:53 +02:00
Errant abe17f5842 Role time tracking support for admins (#31776)
role time tracking support for admined players

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
Princess Cheeseballs ea166512c4 Balance swing at Vestine (#42302)
* AAAAAAAAAAAAAAAAAAAAAAA

* whhops

* full range whoop

* less diff any%

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
Quantum-cross ed14899032 Allow late join from arrivals to be considered for antagonist. (#39837)
* Allow late join from arrivals to be considered for antagonist.

* Don't use `PendingClockInComponent` to block late join antag selection, instead do an arrivals grid transform check with new helper function `IsOnArrivals`.

* Minor formatting fixes

* missing using

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2026-04-04 16:57:53 +02:00
chaisftw 4ac5f8b1d3 Spray bottles with visible reagent contents (#42155)
* Spray bottles with visible reagent contents

* Fixed cargo catalog to correctly reference the new spray bottle rsi

* Fixed indentation on rsi meta files

* Updated copyright in spray_bottle.rsi meta

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

Co-authored-by: āda <ss.adasts@gmail.com>

* Updated to follow yml convention, modified to inherit from DrinkBase and renamed fill textures

* Fixed solution names

* Updated solution name in BorgMegaSprayBottle

* de-hardcode solution name

* less breaking

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
SlamBamActionman 7a324cfbe2 Add the ability for station maps to track grids they are not on (#41248)
* Initial commit

* Accidentally included the nukie map changes

* Fix the gridcheck

* Addressing review

* Review change

* Review comments
2026-04-04 16:57:52 +02:00
SlamBamActionman 66ac4f1e42 Add admin logs for connecting/disconnecting players (#42363)
* Initial commit

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:57:52 +02:00
Pok 9f887379f2 Predict DrainSystem (#41711)
* DrainSystem-move-to-shared

* random

* review

* review 2

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
mikey cb431459fd Increase shuttle FTL cooldown to prevent FTL spamming (#42209)
* seperate out shuttle cooldowns

* fix

* feedback

* fix spacing

* update to TimeSpan

* GOAT float

* return to TimeSpan

* add var

* clarify with seconds

* clarifying some things
2026-04-04 16:57:24 +02:00
B_Kirill 1cf546113d Add craft for bonfire and bonfire with stake (#42211)
* Add craft for bonfire and bonfire with stake

* review

* review

* nullable MaxFireStacks

* retry

* retry

* review

* I will change it and hope that they will agree with me

* Revert "I will change it and hope that they will agree with me"

This reverts commit 83823692d0116bf9aa9eceb85a10e95c88b51fb9.

* construction

Merged the graphs
Changed the bonfire stake ID to follow the proper naming scheme

* add destroy sound

* planks Instead of logs

* of course I forgot about ftl

* Slarti review + Princess review

Yes I sneaked an admeme abuse change here

* a small fix

* clamp firestacks

* This was on purpose, leave as is

This reverts commit 7d63e38b66cb63e5e50b7fac5030013e2ef508b5.

* irrelevant

* Fixtures

* cleanup

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
Princess Cheeseballs 865277156b Allow items spawned in the smart fridge to show up as an entry. (#42268)
* Allow items spawned in the smart fridge to show up in the view

* AAAAAAAAAAAAAAAAAA

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
Tayrtahn 04b9645b62 Fix broken state when attempting to escape a locker while cuffed (#42313)
Check that the DoAfter starts successfully instead of just assuming it does.
2026-04-04 16:57:24 +02:00
LevitatingTree 32d5681e9e Bring back shrug sanitization in a different form (#41236)
* Re-add chat-san & add o//

* changed o// to :?
2026-04-04 16:57:24 +02:00
Perry Fraser 0ae4843e03 fix: respect AllowedSlots for gogo hat (#39189) 2026-04-04 16:57:24 +02:00
Tayrtahn eb51cc6861 Fix forced vaping checking if the user's mouth is blocked instead of the target's. (#42311)
Swap user and target arguments of IngestionSystem.HasMouthAvailable call.
2026-04-04 16:57:23 +02:00
SomegnihT 0dd1a6708c Vox now say they become fried chicken upon taking enough heat dmg (#42280)
* Made it so that vox now say they become fried chicken upon taking enough heat dmg

* updated a comment to be more clear

* changed the name of bodyburnvox-text-other to bodyburn-vox-text-other

* forgot that I needed to also update the text in vox.yml to go with the previous commit change

* BurnBodyBehavior now takes bodyburn-text-others as default

* fixed suggested changes

* Relized I forgot to do a suggested change, I have now done it

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Samuka 5b0006bde9 Xenoborg camera monitor now shows xenoborgs names (#42205)
* update camera id

* revert code changes in SharedSurveillanceCameraSystem

* why change camera id if you can just send the entity name
2026-04-04 16:57:23 +02:00
ScarKy0 eac1f40d4d Predict Rotting Examine (#42254)
* init

* review

* test

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00