Commit Graph

26990 Commits

Author SHA1 Message Date
muon 8da449de03
Update/fix existing furniture (#5355)
* renamed Δv railing to reinforced variant

* made delv railings craftable, TODO: fix decon and hitbox

* wip

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

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

* commit fixes by the illustrious verybigman311

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

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

* fix: ergo chairs now unanchored on creation, counter corner textures fixed. TODO: counter intersect texture redos for metal, wood, craft

* rug and mat constructiongraphs added, countertops fixed. rug orientations need to be fixed

* i hope this will still work

* out of time

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

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

* i forgot to remove this

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

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

* Delete useless constructiongraph

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Revert "Delete useless constructiongraph"

This reverts commit 2be446d310.

* final changes before review, fix offset desks

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

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

* Update Resources/Prototypes/Entities/Structures/Walls/railing.yml

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Update Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/rugs_carpets.yml

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Apply suggestions from code review

Co-authored-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Apply suggestions from code review

Co-authored-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* add locids

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

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

* revert alt desk to normal

* fix test fails

* fix test fails pt. 2

* hopefully last fix

* rug fixes

* fix up mats required

* oops i forgot to add this

* Apply suggestions from Toby222's code review

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

* Apply additional suggestions from Toby222

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

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

* oookay one last thing maybe

* apply additional review changes

---------

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <243844715+muonpoly@users.noreply.github.com>
Co-authored-by: iipro-rgb <71106851+iipro-rgb@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>
2026-04-06 12:55:48 +02:00
Delta-V bot d2e94987c2 Automatic changelog update 2026-04-06 02:41:08 +02:00
Halo3moth 266312fd72
Super weapon replacement real not fake (#5542)
* boop

* forgor about the leviathan

* buff ICEE give cannon scope

* maybe fixed?

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

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

* Update uplink_catalog.yml

* boop

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

Co-authored-by: Radezolid <snappednexus@gmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Radezolid <snappednexus@gmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

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

Co-authored-by: Radezolid <snappednexus@gmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* should be all of it

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

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

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
2026-04-05 21:40:48 -03:00
Delta-V bot 694af28924 Automatic changelog update 2026-04-05 22:35:31 +02:00
Theo 0d23ee226e
fireaxes can be placed in suitstorage (#5593) 2026-04-05 17:35:12 -03:00
Delta-V bot 96e53839af Automatic changelog update 2026-04-05 15:24:51 +02:00
Stxcking 2998efd4bf
Fix: Energy Gun Fire Mode Pop-up Message (#5624)
buh
2026-04-05 15:24:32 +02:00
Delta-V bot dbb8ff9c45 Automatic changelog update 2026-04-05 13:15:54 +02:00
Delta-V bot 6122ce9837 Automatic changelog update 2026-04-05 10:56:15 +02:00
github-actions[bot] 0f70e0695c
Update Credits (#5625)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
2026-04-05 03:56:28 +02:00
Delta-V bot a10492a9d1 Automatic changelog update 2026-04-05 03:04:38 +02:00
Stxcking 2df248b2f3
Fix Dragon and Sharkminnows being Spacewind-ed (#5523)
* MoveByPressure set to false

same comp that makes dionas spacewind immune

* Telling the truth now
2026-04-04 22:04:17 -03:00
Delta-V bot accee36bd5 Automatic changelog update 2026-04-04 21:39:44 +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
Delta-V bot a123f242c0 Automatic changelog update 2026-04-04 21:19:03 +02:00
Stxcking 08dae07425
New Fountain Variant: Icy (#5560)
* Oo Icy Fountain

* [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>
2026-04-04 16:18:44 -03:00
Delta-V bot 275ff0e7cb Automatic changelog update 2026-04-04 20:59:52 +02:00
Minerva 7182a2e310
Makes surgical caps optional for Surgeon loadout (#5614) 2026-04-04 18:59:32 +00:00
Delta-V bot b9b65de076 Automatic changelog update 2026-04-04 20:56:13 +02:00
Minerva 13bddb5b75
Adds DV-specific scrubs to the MediDrobe (#5613) 2026-04-04 15:55:52 -03:00
Delta-V bot b64912545f Automatic changelog update 2026-04-04 20:21:24 +02:00
Field Command 66a07d2a55
Cloak and hat for captain and HoS plus some extra. (#5601)
* Cloaks and hats for captain and HoS

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

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

* Removed time requirement

* evil

* Added fix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-04-04 15:21:03 -03:00
BarryNorfolk 72ab0bb9d5 Fixup blood 2026-04-04 16:57:55 +02:00
BarryNorfolk ae1c3e33b6 Add missing string to silence console warnings 2026-04-04 16:57:55 +02:00
BarryNorfolk 104d2d53da Fix species name missing for kistune yaml 2026-04-04 16:57:55 +02:00
BarryNorfolk 46c0d794e1 Fix up some missing localisation strings 2026-04-04 16:57:55 +02:00
BarryNorfolk f068aa237d Remove extra chatsan-shrugs 2026-04-04 16:57:55 +02:00
Velken d3086de6d6 Admin Anomaly Scanner (#42443)
* admin anom scanner

* improvement

* green

* sprite
2026-04-04 16:57:55 +02:00
Samuka 66258005cb Adds more starting materials for the mothership (#42448)
* more mats

* update the guidebook

* missed a word
2026-04-04 16:57:55 +02:00
pathetic meowmeow 695ea81c05 Fix core pinpointer pieces having a 5-pointer recipe (#42446) 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
ScarKy0 86d91c8cba Add Mortar and Handheld Juicer (#42019)
* init

* API

* testing

* review

* return

* good enough, fix later

TODO:
Proper prototype
DoAfter
Sounds

* "proper" prototype

TODO
DoAfter
Sprite

* proper protos, mortar sprite

* juicer sprites

TODO:
Juicer sounds
Makeshift crafting recipes
Add regular to vendors

* sprite tweak

* juicing sound, cleanup, construction

* vendors

* line end

* attribution newline

* small balance tweak

* Let it be known id never webedit

* meta

* item size

* review

* handhelds

* partial review

* cache solution, looping

* graph

* review

* popup

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
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
Velken 83b2bae724 Fix RCD light spam, bypass of indestructible tiles and some plating fixes (#42432)
* No more light spam, and some plating fixes

* fixed test
2026-04-04 16:57:55 +02:00
BarryNorfolk 693e29c0f2 Remove downstream construction-graph-tag-paper 2026-04-04 16:57:54 +02:00
ScarKy0 63975c4c49 Add Paper Centrifuge (#42040)
* init

* sound

* sprite, half functional construction

* proper recipe

* oops

* loop sound

* inhands

* review

* review squared
2026-04-04 16:57:54 +02:00
Kyle Tyo 0bf253f995 Add attribution to Tippy.rsi (#42346)
Update meta.json
2026-04-04 16:57:54 +02:00
BarryNorfolk 45bff60c3d Downstream fixes for #36132 (Vials) 2026-04-04 16:57:54 +02:00
āda 7467e96e99 Rebase vials to DrinkBase, closeable vials, mini vials (#36132)
* .rsi

* mini vial

* try stop TryStopNukeOpsFromConstantlyFailing from failing

* slight sprite change

* mail and lathe recipe

* real test fail

* resolve arbitrage

* cleanup

* always forgetting something

* always forgetting something

* drink no more

* remove integrated vial

* initial port

* Rename the rsi states

* Rename the rsi states

* up to standards

* finish

* testfail

* minor touchup

* arby

* op

* mix meta

* small changes to the vials

* commit

* commit

* style nit

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-04-04 16:57:54 +02:00
Orsoniks f55bd21846 Improved Health Examination Coloring (#38231)
* better colors

* fix worst offenders of contrast

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-04-04 16:57:54 +02:00
rumaks bf45a27ec7 Make chemicals not react inside pills (and stomachs) (#41457)
no reactions in pills
2026-04-04 16:57:54 +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
Samuka 477a2948fe Make heavy xenoborg able to "swim" in space (#42415)
MovementAlwaysTouching
2026-04-04 16:57:54 +02:00
Connor Huffine cccb70bcbc Make cancer mice actually hurt (#42298)
* Update animals.yml

* That was a bit too much
2026-04-04 16:57:54 +02:00
ArtisticRoomba 5b5a2529ac Increase TEG power generation by 75% (#42421)
increase TEG power by 75%
2026-04-04 16:57:54 +02:00
SnappingOpossum c47bbd3646 Move artifact random spawners to entity table spawners. (#42422)
* Move artifact random spawners to entity tables

* That's a pretty big thing to miss

* This is embarassing

* Apply review
2026-04-04 16:57:54 +02:00
War__Prophet 6f0d647451 Put arrows on all the single-directional pipes (#42408)
k
2026-04-04 16:57:54 +02:00
Samuka c037990939 Xenoborgs now drop pieces of pinpointer (#42295)
* add sprites

* update sprite

* repaired sprite

* repaired pinpointer

* different id

* piece of pinpointer core

* borgs drop the piece

* end of file new line

* typo

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

* make the tape darker

* four variations

* same variation in the crafting menu

---------

Co-authored-by: āda <ss.adasts@gmail.com>
2026-04-04 16:57:54 +02:00
SlamBamActionman c35ef4ab65 Add a target station map to the LoneOp shuttle (#42376)
Initial commit
2026-04-04 16:57:54 +02:00
Vy d0ad7dbe97 Maid uniform sprite change. (#38335)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
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
ScarKy0 b1b7e884f8 EmpResistance cleanup (#42402)
* init

* yeah

* Update SharedEmpSystem.cs
2026-04-04 16:57:53 +02:00
Sir Warock 969997a693 Pry open critical Borgs (#42319)
* One commit ops

* Please the maintainer gods

* More requested changes

* review

* actually this is probably a good idea

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:57:53 +02:00
ScarKy0 4204e1eeff Viper High Capacity Ammo (#42392)
* yeah

* Fix sprite & let mk58 use the mag

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2026-04-04 16:57:53 +02:00
ScarKy0 7e8ded7fc0 Buff throwing knives kit (#42391)
init
2026-04-04 16:57:53 +02:00
ConstantlyConfused a1c9b4ee3b A handful of typo fixes (#42396)
fix a handful of typos
2026-04-04 16:57:53 +02:00
War__Prophet d43c3ba32f WYA to Where you at (#42350)
* god is dead

* bro

* Update speech-chatsan.ftl
2026-04-04 16:57:53 +02:00
BarryNorfolk 1c571adb68 Downstream fixes for #38898 (Station tile changes) 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
alexalexmax 297276dcc3 Adds EMP Resistance component, gives it to ninja suit and headset (#42334)
* add comp and apply to ninja gear

* cleanup

* requested changes

---------

Co-authored-by: seanpimble <149889301+seanpimble@users.noreply.github.com>
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
ScarKy0 ab9a1ecd68 Lower smuggler's satchel price to 1TC (#42381)
Update uplink_catalog.yml
2026-04-04 16:57:53 +02:00
SlamBamActionman ec13e683ff Add the Syndicate Delivery Console to the Nukie planet + target station maps (#42337)
* Initial commit

* Add station maps
2026-04-04 16:57:53 +02:00
ScarKy0 5351060f7b Lower hyperzine injector cost (#42383)
I love TC
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
Kowlin cddae22e7a Allow the admin door remote to toggle overcharge (#42370)
* Allow the admin door remote to toggle overcharge

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.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
BarryNorfolk 74f7357c40 Downstream fixes for #42123 (Medical borg module rework) 2026-04-04 16:57:52 +02:00
Princess Cheeseballs 13ddcdea36 Medical Cyborg Modules Rework. (#42123)
* PUSH!!!

* Femtanyl

* eh swap em back

* My PR is ruined!!!

* review 2 electric boogaloo

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:52 +02:00
Kyle Tyo 77f524fa25 Fix holywater locale string usage. (#42378)
Update chemistry-bottles.yml
2026-04-04 16:57:52 +02:00
Velken e6d30f7f95 Admin: fixes description for "help osay" (#42368)
2 diff 2 me
2026-04-04 16:57:52 +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
ScarKy0 dcf776afe4 Janiborg Module Cleanup (#42330)
init
2026-04-04 16:57:24 +02:00
BarryNorfolk fc1ea0522d Downstream fixes for #42253 (Predicted mind examine) 2026-04-04 16:57:24 +02:00
ScarKy0 e9b4130ec9 Predict Mind State Examine (#42253)
* init

* review

* i might be stupid

* docs

* datafieldn't

* update comments
2026-04-04 16:57:24 +02:00
SolidSyn 97ed41c408 Foldable wig on clowns mask (#42208)
* Clowns base mask now has the ability to toggle the wig on and off.

* Changes the clown mask to have a foldable wig.

* Adds my credit for the wigless sprites in the meta.json

* Redid the description.

* Added an a to the description. Smiles.

* Resolved changes, thanks beck!
2026-04-04 16:57:24 +02:00
SlamBamActionman 93db96603f Add the Syndicate Delivery Console + Corpsman Medicine Bundle (#41201)
* Initial commit

* Add a note to not abuse the darrrrn machine

* Remove nukie planet (hopefully) and fix duffelbag

* jug solution name

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
Hitlinemoss a0daca78de BUGFIX: Cabbage placed on taco shells no longer turns into a carrot (#42326)
BUGFIX: Cabbage places on tacos no longer looks like a carrot
2026-04-04 16:57:24 +02:00
B_Kirill 2155073625 Fix projectile deceleration (#42320) 2026-04-04 16:57:24 +02:00
ScarKy0 0115f943e6 Stake Admin Alert (#42324)
i forgot this is a thing
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
BarryNorfolk 44e41d5019 Downstream fixes for #29413 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
BarryNorfolk ebefff61a2 Downstream fixes for #42292 (Handheld health analyzer) 2026-04-04 16:57:24 +02:00
āda 483989e1b1 Remove battery from the handheld health analyzer (#42292)
* commit

* review

* review 2

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Princess Cheeseballs a860d2e1b9 Goliath Hardsuit Fixes (#42303)
goliath hardsuit fixes

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
JackspajfMain 45c3eedb55 Fix Capitalization on HoP's Fountain Pen (#42300)
capitalization
2026-04-04 16:57:23 +02:00
BarryNorfolk 7fdccdb89b Downstream fixes for #38878 (Yaml test for non-existent components) 2026-04-04 16:57:23 +02:00
Perry Fraser a15d8db3a2 Remove yaml'd non-existent components + test for that (#38878)
* chore: remove some unregistered components

* feat: test for components being ignored on client + server
2026-04-04 16:57:23 +02:00
āda 2b54519baa Reorganize and clean Fun yml (#42184)
* don't look at this commit size i'm not proud

* self review

* more final changes

* more comments

* review

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
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
āda 8eb0d3eb32 Grappling gun rope visual change (#42207)
* sprite changes

* system changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Kyle Tyo 75cb2931c5 Fix attributions for /Resources/Audio/Misc/ (#42230)
* commit

* cleanup
2026-04-04 16:57:23 +02:00
ScarKy0 caded37f81 Chameleon Projector Battery, Price Decrease (#42271)
* init

* fuck using

* glowup

* unused

* meta

* whuh

* review

* tests

* Update SharedChameleonProjectorSystem.cs
2026-04-04 16:57:23 +02:00
0-Anon 848a1e2185 Guarantee glue and lube in toybox (#42146)
Update fun.yml
2026-04-04 16:57:23 +02:00
SnappingOpossum 4ce6d3d1af Replace recently added StorageFill with EntityTableContainerFill (#42269)
I HATE STORAGE FILL
2026-04-04 16:57:23 +02:00
BarryNorfolk f8f03e2dd3 Downstream fixes for #42200 2026-04-04 16:57:23 +02:00
ThatGuyUSA 18280c51d1 [FEATURE] More icons (#42200)
* innit bruv, but also done!

* added comment to signify why it's like that

* init, but done

* init commit

* you think you got everythin, until you didn't

* credits and one last touch up

* i fucking hate git

* KILL OLD COMMITS

This reverts commit 6f834a51de611f215ede02f291a9d834777884a5.

* KILLING OLD COMMITS

This reverts commit 36e1f4a476b873f2326723740eccf455060520d8.

* I am going to become the joker

* one day i'll learn how to delete old commits properly

* god fucking damn it

* capitalization!
2026-04-04 16:57:23 +02:00
Princess Cheeseballs 1bd5ab6b02 Revert Closable Jugs (#42267)
* remove lid

* remove changelog

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Velcroboy b63dc6c07e Adds sky blue curtains/tables to their respective spawners (#42266)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2026-04-04 16:57:23 +02:00
SnappingOpossum 3636651899 Move some miscellaneous random spawners to entity tables (#42245)
* Move some miscellaneous RandomSpawners to entity tables

* Fix a parenting issue and some conventions
2026-04-04 16:57:23 +02:00
IProduceWidgets 117643aa74 jugs closeable, move chemistry entities into chemistry directory (#29413)
* jugs closeable, move chemitsry entities into chemsitry directory

* forgor to stage json. I hope i didnt stage robust :anxious:

* Who likes cargo? Not me. Lets remove it.

* Remove seal, make the amount examinable regardless of open or not, update jug icon

* apply iaada's parenting

* fix issues tdw parenting

* Review changes

* Fix sprite rename

* small touchup

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
ScarKy0 31a71d70bf Cleanup Toolshed Locale (#42259)
* it begins

* god help me

* FINALLY
2026-04-04 16:57:22 +02:00
ScarKy0 c3d7e8d88e Msg Toolshed Command (#41936)
* init

* subfolder

* note
2026-04-04 16:57:22 +02:00
John 83e063c6b3 fixed typo/duplicate adjective (#42249)
fixed typo/duplicate
2026-04-04 16:57:22 +02:00
Vasilis The Pikachu 56729fbdfa Revert "feat: RnD tech research console now have reroll feature (#32931)"
This reverts commit 1f2d80297cb81e8dbbd1c1f46aeb531a2624204c.

Discussed during the maintainer meeting and voted to be reverted at this time.
2026-04-04 16:57:22 +02:00
Red 6c8f446f12 Melee weapons animations upgrade (#41425)
* upgrading

* Update MeleeWeaponSystem.Effects.cs

* Easing
2026-04-04 16:57:22 +02:00
Princess Cheeseballs 4677401244 [Staging] Let admins ignore the laws of physics again. (#42221)
admin ignore physics

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:22 +02:00
Aearo-Deepwater be5022a069 Ironsands Structures (#39793)
* Add 6 new ironsand tiles

Ironsand plating and ironsand tile are based on the asteroid plating and
asteroid tile tiles. Ironsand concrete tiles are based on the concrete
and gray concrete tiles. Packed ironsand is slightly based on smooth gray
concrete, but mostly original.

* Add ironsand cobble wall

* Finish adding tile objects for ironsand concrete tiles

Includes inhands, even though the other concrete tiles don't even have
'em.

* Add cutter recipes for ironsand concrete

I'm sad that I can't require iron ore for these recipes. Iron ore can't
go in a cutter, though, and changing that seems like it'd be more
complicated than it's worth. Assuming I don't just make the thing accept
any and all ores, which... um.

* Delete temporary .swp file that shouldn't have been in the repo to begin with

* Add ironsand pavement tile

* Add ironsand stone door

* Add ironsandstone walls

* Improve packed ironsand texture

* Add ironsand step

* Add ironsand step corner

* Add three mysterious, runed pillars

* Lighten ironsand wall border

* Replace art for paved ironsand

* Make steps more closely match paved ironsand tiles

* Increase border contrast of ironstone door

* Add fake "astro-" versions of ironsand tiles

* Add second tall pillar sprite

* Add prototype for second tall statue

* Make astro-ironsand researchable and latheable

* Update corner step texture to match straight steps

* Add corner steps that go the other way

* Add door variant to match cobbled ironsand wall

* Fix license for ironsand step sprites

* Darken ironsandstone walls for better contrast

* Update ironstone doors to match walls and be more distinct

* Remove merge conflict detritus

* Fix duplicate component

* Update tile stack prototypes

* Add detail to copyright info

* Improve ironstone wall and door destruction

* Normalize ironsand statue prototypes

* Normalize ironsand tile object prototypes

* Move ironsand plating in with the rest of the plating tiles

* Remove .gitignore additions

I might just make a new PR just for this, though. I'm very tempted.

* Add sound effect to ironsand step destruction

* Add abstract base class to stairs and steps

* Remove redundant destruction trigger behavior from cardboard door

* Add destruction behavior to ironsand statues

* Fix up ironsand step prototypes

* Remove redundant bits from ironsandstone wall prototypes

* Remove ironstone door crush behavior

* Add individual ironstone statue bounding boxes

* Make ironstone statues shootable

* Tweak ironsand statue bounding boxes
2026-04-04 16:57:22 +02:00
K-Dynamic 1e738be801 Intercom resprite (#41962)
* intercom resprite

* fix typo

* change copyright
2026-04-04 16:57:22 +02:00
Ignaz "Ian" Kraft bee1b9aa33 expanded FillLevelSpriteTest test and fixed found issues (#34165)
* fix clustersoap eaten sprite

* also assure that every entity with the SolutionContainerVisualsComponent has a AppearanceComponent

* use the new sprite system + fix the fill for cardboard arrows and the mosin

* fix merge issue
2026-04-04 16:57:22 +02:00
Samuka 6f94ca5b0b Make xenoborg thrusters anti-easy-sabotagge (#42201)
* code

* cant be toggled

* can't unwrench

* no rotating it

* comments

* change from PreventToggle to CanToggle

* commentary

* Update Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:22 +02:00
YoungThug d22bdb8537 Ninjas now get a custom bag! (#42112)
* Ninjas now recieve a custom satchel

* Original Size

* Requested Changes + Making bag silent

* Add code comment
2026-04-04 16:57:21 +02:00
FotY 1aaea67fb0 (Fix) Make paper extinguishable with fire extinguisher (#42142)
Make paper extinguishable with fire extinguisher
2026-04-04 16:57:21 +02:00
Princess Cheeseballs eaeeb81f56 Status Effects Toolshed (#41670)
* toolshed :)

* Yeah they call me the gamer

* Fix test fails

* refactor: extract method ZeroAsNull

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2026-04-04 16:57:21 +02:00
OnyxTheBrave 6f9c3bedcb Chemmaster Pill Source (#40121)
* Buttons and basic internal data

* The buttons DO something

* it works?!!

* I hate predictions

* 5000 monkeys on typewritters

* who let the monkeys code?

* Localizations

* waiter, more commits please

* Not going insane (this is a lie)

* last one I SWEAR

* Some improvements ported from Moff

* clean it up a little

* one more cleanup

* The chemmaster is not a mime

* Fix my mistakes + address the other review

* Point to what chemmaster is broken, and why it's broken

* ChemMasterComponent changes

* Margin for packaging source

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:21 +02:00
mikey 4e75d99f8f Align detective stamp with rest of stamps (lower by 2 pixels) (#42177)
move detective stamp down 2 pixels
2026-04-04 16:57:21 +02:00
0-Anon e0a604522b Ammonia restores Rat King Bloodlevel (#42167)
* Ammonia restores Rat King Bloodlevel

Adds a saline effect to ammonia for creatures with the rat metabolizer type condition (aka, rat kings)

* error fix

code did not like amount under condition so fixing that, and restoring amount to 1 to be identical to how it was working in the video. amount 6 was comical levels of blood restoration
2026-04-04 16:57:21 +02:00
GeneralGaws a40a219261 Remove syndicate bomb restock time (#42114)
* no restock time

* add timer
2026-04-04 16:57:21 +02:00
PAFFhassoocks 4d817b7e79 puts Space ninja survival box contents into their bag (#42102)
* removes extended survival box, but adds most contents into the ninja's satchel

* major essential bugfix
2026-04-04 16:57:21 +02:00
YoungThug 4c37364c8d Add antag control for the space ninja (#42133)
* Add antag control for the space ninja

* Remove whitespace

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
2026-04-04 16:57:21 +02:00
SnappingOpossum 4ebd2d34cd Add crayon box to Big Bite meals (#42077)
Shuffle things, use table for big bite
2026-04-04 16:57:21 +02:00
Leah e8a4428364 update communicator kit description for voice mask implanter (#42115)
update thief backpack description for voice mask implanter
2026-04-04 16:57:21 +02:00
EchoOfNothing 9e2b871882 Merge IFF controls into one control. Make syndicate IFF turned off by default. (#42104)
* Merge IFF controls into one control.

* Implement logic to hide IFF of sydicate IFF console on map load. Add hideOnInit property to IFFConsoleComponent

* DataField

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2026-04-04 16:57:21 +02:00
SonarZeBat e66a43a2bc Lowered Xenoborgs MinPlayers From 40 To 30 (#42111)
Update subgamemodes.yml
2026-04-04 16:57:21 +02:00
Nox 90580db666 ERT Overhaul 3/3: Loadouts (#38481)
* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* First implementation of humanoid.yml

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added leader, chaplain, and half implemented paladin

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Bit more work on chaplain

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Started adding engineer

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished ERT security, Leader, and Chaplain. Issue remaining with the fills and shotgun ammo, rifleman half done.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added all loadouts

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added names, finished loadouts.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Tested loadouts, added chaplain job icon (finally), ready to go!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* ERT now use double tanks by default

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Misc fixes

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fails

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Minor spelling mistake:

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed all known issues with the PR, ready for review!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed random metadata

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fail

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed test fail I hope?

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* defintely fixed test fails

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Slight loadout fixes to bring everything up to date.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished reverting contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Replaced the melee ert security with a marksman

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag, made engi loadouts work without a duffel (still finishing medic loadouts)

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Finished updating loadouts to account for removed duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Replaced armed engineer's C4 with explosive cord

* Replaced leader's XL8 with a standard Lecter

* Updated leader loadout

* Minor fix to ERT leader

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* fix formatting

* Fixed rifleman, armed engineer, and test fail

* Finished vanguard, chaplain.

* Fixed minor spelling mistake

* Gave ERT medics back their omnizine

* Added ERT security breacher, made ERT survival boxes 2x2.

* Finished implementing security shotgunner

* one small thing

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:21 +02:00
GeneralGaws ef1d5f1bd6 Energy guns' fire mode text formating fix (#42103)
issue
2026-04-04 16:57:20 +02:00
alexalexmax d8ce0d767b Voice mask effects are toggleable and hide your accent (#41965)
* apply negate accents system

* add toggle to voice mask ui

* roll negateaccents into voice mask system, delete negate accents comp&system, update yml entries

* convert button to ToggleButton and some cleanup

* retry for heisenfail

* accent toggle

* update names and add mask active check for accent hiding
2026-04-04 16:57:20 +02:00
TheFlyingSentry be00ff32c8 Fixed Xeno air alarms warning/danger sprites not showing (#41590)
Fixed Xeno air alarms (someone didn't copy paste correctly :3)
2026-04-04 16:57:20 +02:00
lzk 4a35a28e1b make comp-repairable-repair sane (#42048) 2026-04-04 16:57:20 +02:00
BarryNorfolk 9307e48366 Remove IPC InputMover for HeadIPC 2026-04-04 16:57:20 +02:00
BarryNorfolk a1ba045f59 Downstream fix for #30515 - Temperature damage 2026-04-04 16:57:20 +02:00
TemporalOroboros 3fe2f0bd7d Splits temperature damage processing into its own component (#30515)
* Creates TemperatureDamageThresholdsComponent

* Obsolete TemperatureComponent fields

* Use TemperatureDamageThresholdsComponent
Moves all the uses of the relocated TemperatureComponent fields to use the TDTC versions

* Removes the obsolete TemperatureComponent fields

* Update YAML definitions

* Update doc comments

* Split TemperatureSystem
Creates TemperatureDamageSystem and moves the damage handling from TemperatureSystem

* Cull unused using statements

* Use component-based damage tick scheduling

* Fix temperature damage processing
Check was inverted resulting in things never starting to take temperature damage

* Poke tests

* Add TemperatureDamageThresholds to new prototypes

* Move TemperatureDamageThresholdsComponent to Shared
Parity with TemperatureComponent

* While I'm here
Fixes warning regarding obsolete ProtoId validator attribute

* Fix YAML errors

* Fix merge errors

* Rename TemperatureDamageThresholdsComponent -> TemperatureDamageComponent

* Use ContentHelpers.RoundToLevels for temperature alerts

* Fix YML

* A fuckton of cleanup

* working cleanup

* fix

* misc additions

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:20 +02:00
Stefano Pigozzi d019820a2b Fix greytide terms in Italian accent (#42020)
* Use singular form for greytider in Italian accent

* Use "curva" for "greytide" instead of "curvisti" in Italian accent
2026-04-04 16:57:20 +02:00
Stefano Pigozzi cebaf66687 Change "pappa" (food) to "papà" (dad) in Italian accent (#42018) 2026-04-04 16:57:20 +02:00
Stefano Pigozzi 9165fd59e2 Change "mafioso" (singular) to "mafiosi" (plural) in the Italian accent. (#42026)
Change "mafioso" (singular) to "mafiosi" (plural)
2026-04-04 16:57:20 +02:00
B_Kirill 0002d1ec8d Fix incorrect table breakage sound (#41968)
* Fix incorrect table breakage sound

* review

* retry

* are you kidding me
2026-04-04 16:57:20 +02:00
imatsoup f799c01367 Make donk co. microwave syndicate contraband (#41960)
add BaseSyndicateContraband parentages to donk co microwave and donk co microwave machineboard
2026-04-04 16:57:20 +02:00
imatsoup b25020bcf1 Update debug backpacks to use the proper suffix (#41959)
Update backpacks.yml
2026-04-04 16:57:19 +02:00
Crude Oil 72ed427224 Port FTL arrival effect fix from https://github.com/new-frontiers-14/frontier-station-14/pull/3495 (#41951)
Port FTL arrival fix from https://github.com/new-frontiers-14/frontier-station-14/pull/3495
2026-04-04 16:57:19 +02:00
JohnJohn 8a39cff174 Allow cable coils to be destroyed (#41279)
Add damageable and destructible types to cable coils
2026-04-04 16:57:19 +02:00
BarryNorfolk 6c555f10fc Downstream fixes for #37970 (Physics assert) 2026-04-04 16:57:19 +02:00
Princess Cheeseballs 460f1e65f4 Physics Assert in SharedMoverController (#37970)
* Physics asserts and Xenoarch fixes

* Fix blocking asserts

* Alright ready for the test fails

* Fix whitespace issues

* Fix whitespace

* Okay fix whitespace issues for real

* Fix test fails

* Temp fix

* Fix

* Whitespace

* Added a big ass comment

* Right

* A

* Should work

* Debug performance

* Mothership

* fix test fails real

* push

* fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:19 +02:00
Sir Warock b4d182348c Miscellaneous Injector fixes + BorgHypo fill sprites. (#41932)
* Various fixes

* Fix Gorlex Hypo not showing visuals

* Give Borg Hypo Fill sprites

* Bluespace Syringe speed increase

* fix

* one whitespace change

* Undo debug change

* Replaced String Message with better

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:19 +02:00
Samuka f5801718a3 Fix the mothership again (again) (#41924)
* fix the mothership again

* renamed that lever
2026-04-04 16:57:19 +02:00
Princess Cheeseballs f18384b89b [Staging/Hotfix] A couple bloodstream fixes. (#41906)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:19 +02:00
korczoczek 1df0507cec Added sprites for openable ingredients (#41923)
* dont you hate it when you open your bag, but it stays closed?

* linting my yml
2026-04-04 16:57:19 +02:00
Sir Warock d55bd19318 Shield QoL + buff (#41326)
* Add Damage Examine to Shields

* Make Repairs repeat when not fully repaired

* Make some Shields repairable

* Please the Grammar Gods
2026-04-04 16:57:19 +02:00
SlamBamActionman 66abd3299a [Staging] Fix certain projectiles moving faster than intended (#41905)
Return to original value (25)
2026-04-04 16:57:19 +02:00
BarryNorfolk 023abacc12 Add extra FTL for converting name to LO for BoxQMStamps 2026-04-04 16:57:19 +02:00
Hitlinemoss a2fbf23366 Cleanup of circuit tote / stamp box prototypes + added small cardboard boxes as a general item (#41335)
* 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

* Whoops, forgot to remove some labels
2026-04-04 16:57:19 +02:00
Fildrance 73ba5d452d feat: RnD tech research console now have reroll feature (#32931)
* feat: RnD tech research console now have reroll feature

* fix: disable Rediscover button when there is not enough currency or user have no access

* refactor: xml-doc, extract method, minor simplify xaml

* minor cleanup after review

* refactor: change sending research server points amount into BUI from state to  ResearchServerComponent (using AfterAutoHandleStateEvent)

* feat: now tech rerolls will have cooldown to ensure no one can spam-spend all dept budget instantly

* refactor: revert unneeded code

* refactor: whitespaces

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2026-04-04 16:57:19 +02:00
BruhIsaac c4e3ce0214 Rebalance the Ghost Role Raffles (#33157)
* Up raffle time/no-add time

* upd

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:19 +02:00
Unkn0wn_Gh0st 27da7f4991 Syndicate Wall Lockers and Secure Storage (#33251)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:19 +02:00
BarryNorfolk a5453cdcd4 Downstream fixes for #41901 (Stamina status effect) 2026-04-04 16:57:19 +02:00
SlamBamActionman d514f400a4 Make StaminaModifier into a status effect, apply to Hyperzine (#41902)
* Initial commit

* Probably better this way.

* Review fixes

* cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:19 +02:00
Hitlinemoss 713159fa1a Adds debug wizard's grimoire (#41900) 2026-04-04 16:57:19 +02:00
Centronias d50706dd5e Adds BallisticAmmoSelfRefillerComponent (#38537)
* Adds BallisticAmmoSelfRefillerComponent

And uses it to replace battery-based refilling of the Syndicate L6 and Viper modules.
- Add `BallisticAmmoSelfRefillerComponent`
- Handle `EmpPulseEvent` to pause refilling behavior for EMP's duration
- Change `Content.Server.Weapons.Ranged.Systems.Update` override in `GunSystem.AutoFire.cs` to `UpdateAutoFire`
- Add `Content.Server.Weapons.Ranged.Systems.Update` to `GunSystem.cs` so that it can call `UpdateAutoFire` and `UpdateBallistic`
- Add public methods to GunSystem for use by refilling implementation
  - PauseSelfRefill
  - IsFullBallistic (same as #299)
  - CanInsertBallistic (same as #299)
  - TryBallisticInsert (same as #299)

* _timing -> Timing

* unspawned count stuff

* imagine building the code before pushing

* - apply to c20r ROW
- make predicted/shared

* revert server system import only changes

* oop

* o great and wise Slarti

* Scar comments

* field deltas + correct serializer

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:57:18 +02:00
BarryNorfolk bb4f91d408 Add missing reindeer sprites 2026-04-04 16:57:18 +02:00
BarryNorfolk 25b293b761 Downstream fixes for #35071 (bloodstream changes) 2026-04-04 16:57:18 +02:00
Nikovnik 7fc0e3cb26 Metabolizing bloodstream (#35071)
* merged chemical into bloodstream

* changed injectable to bloodstream

* separated bleeding and direct blood removal

* removed blood gain from protein

* reduced blood gain from saline

* rejuvenating fills to reference volume

* fixed blood regulation

* red mead requires stirring to make

* reverted accidental line deletion

* cleared the skeletons from the closet

* additional routing

* field rename for xeno

* removed mention of chemstream and field rename for asteroid mobs

* minor optimizations

* Revert "reduced blood gain from saline"

This reverts commit de26fd1c0d99f3019fe7dd1451a50230cc90f058.

* Revert "removed blood gain from protein"

This reverts commit 7a1648caf39fe26406db73c2a5afa389b82c612f.

* removed unused component fetch

* dead check mini refactor

* eventized blood exclusion

* quick fix

* Pain

* Commit of doom

* COMMIT

* renamed bloodMaxFactor to MaxVolumeFactor

* addressed floating point error

* returned vomiting chemicals

* blood reagent always skips the flush

* no need to mention blood reagent

* fixed passing blood flush

* adadsafasfasfassfasf

* whoops

* merge fixed injectors

* Revert "adadsafasfasfassfasf"

This reverts commit 0a5313a68dd6484d36d28d08930c76851b72ae38.

* simplify reagent removal

* enabled foreign blood transfusion

* Revert "COMMIT"

This reverts commit 19abd679cd7761ebd47bb242bd644176a3006a42.

* simplified reagent removal when modifying blood level

* removed misleading coment since the changes

* documented MetabolismExclusionEvent

* fixed negative negative modification of blood level

* fixed hypervolemia not normalizing

* constrainted blood modification

* returned bloodpack stop on fully healed

* forgot to stage this

* band aid for diona blood

* swapping GetReagent with GetPrototype

* optimize blood filtering

* multiplicative multi reagent blood level calculation

* removed unused stuff

* optimized blood calculation a tiny bit

* added per reagent blood regulation

* optimized (referenceVolume + bloodReagents) into referenceSolution

* polished coded to proper function

* forgot to stage rootable system change

* clean up, unnecessary GetBloodLevel call

* rename method name to TryAddToBloodstream instead of Chemicals

* placed overfill safety

* cleanup and final touches

* final touch

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
slarticodefast f19ee48df9 wallmount debug overlay (#38495)
* wallmount debug overlay

* make circles a little smoother

* add permissions

* Update Resources/Locale/en-US/commands/show-wallmounts-command.ftl

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>

* fix

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Princess Cheeseballs 07b74a9e75 Arcryox Metabolism Fix (#41881)
* fix arcryox metabolism

* dont change that shit wrong branch

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Pancake b8b75c456b Tweak Killer Tomato Size (#35866)
* Update miscellaneous.yml

y tho

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
beck-thompson a126886756 Add foolbox (#41473)
* Add foolbox to clown lockers

* this is beter

* updated table w/ new items

* more clown like

* Tweaks

* thank you iaada

* cleanup

* review

* fun!

* fixes and microbalance

* clowns start with it inhand now
2026-04-04 16:57:18 +02:00
Hitlinemoss 5054caa29f Station AI now rolls before most standard crew (#41663)
* Station AI now rolls before standard crew

* github tests are high

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Samuka 740cc10e83 Fix mothership core fixture (#41745)
fix mothership core fixture
2026-04-04 16:57:18 +02:00
āda 3d66275984 Remove unused tags tied to unused entities (#41366)
* commit

* fix for haunted

* not a magazine

* unused sprites

* the lost tags

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:18 +02:00
Samuka 42fcf00920 Xenoborg door control module (#41546)
* add door control module

* some commentary

* can't eject stuff anymore

* make xenoborg door remote eletrify doors

* clean yml

* anchors and aliases

* not show stuff about id in xenoborg access config

* engi xenoborg can see eletrified doors
2026-04-04 16:57:18 +02:00
JesterX666 3e4a468921 Ignite atmosphere on explosions (#41262)
* Ignite atmosphere on explosions

* Fixed to add a temperature property

* Code review corrections

* Removed unused usings

* Correction to use TryComp instead of EntityManager to make it prettier

* Code review corrections

* Code review corrections

* Corrections

* misc fixes

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2026-04-04 16:57:17 +02:00
psykana 961ab11293 Add tile atmosphere tests (#41228)
* Tile atmosphere tests

* master markers

* TryLoadMap

* whoopsie

* Dirty

* Add new abstract class, room spacing tests

* review
2026-04-04 16:56:53 +02:00
Samuka afa3838d38 Repairing borgs now takes multiple doafters (#41638)
* borg repair is now multiple doafters

* is a float now

* use else

* remove random new line i added for some reason

* add new line at the end of the file

* add documentation

* made repair system super robust

* borg heal faster from crit

* forgot to make it a datafield

* less overpower

* cant repair futher than the threshold for alive if not alive or dead

* fix math

* more math

* fixes

* some comentary

* more accurate

* simple solution

* new solution

* better numbers

* more accurate

* use helper function

* fine tunning the number

* better way to restart the doafter

* update AutoDoAfter

* not used

* more clear

* remove inline if

* improve helper methods

* updare pop up message

* another unused

* nuke consecutive repair bonus

* increase the repair (so it doesn't take ages to fix a borg)

* back to 10 per repair

* heal evenly

* fix for edge case

* fix

* fix

* it works now

* add / fix comments

* small clean up

* make easier to understand

* use FixedPoint2.Zero

* make it smaller

* add support for group even heal

* ops

* easier to read

* typo

* make the HealEvenly better

* rename to GetDamage

* negative value

* Update Content.Shared/Repairable/RepairableSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:56:53 +02:00
MissKay1994 b9cb30e71e Prevent Initial Infected from rolling on evac (#41863)
evac ambuzol
2026-04-04 16:56:53 +02:00
Nox 2f4a8e6812 ERT Overhaul 2/3: Equipment (#38105)
* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2026-04-04 16:56:53 +02:00
Meara 38dce9b12c Adds crowbar to Mediborg Rescue Module (#41861)
Added crowbar to Borg Rescue module.
2026-04-04 16:56:53 +02:00
Nox 321ba725da ERT Overhaul 1/3: Apparel (#37855)
* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2026-04-04 16:56:53 +02:00
āda ec9b13694b Rollersakes heisen bounty (#41859)
commit

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:56:52 +02:00
ScarKy0 091b7d98b6 Remove roundstart tools from some cyborgs (#41823)
* remove tools

* actually let derelict borgs keep it
2026-04-04 16:56:52 +02:00
JackspajfMain 608730bbe7 Update to Bardrobe to add Pun Pun's outfit (#41705)
bardrobe update to add pun's outfit
2026-04-04 16:56:52 +02:00
āda 1a9aa6f24d Toys entity tables (#41840)
* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

* toys.yml is scary

* pace yourself, hun

* finished tables

* update related tables

* finish tables

* spawners

* new item

* other tables and cargo crate

* move board games

* commit

* last changes

* last last changes

* bounty changes

* remove pies :o(

* readjust prices

* requested microbalance

* friends for life

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:56:52 +02:00
RedSpy 30d17745d4 Make gun chamber empty by default (#41791)
gun chamber empty by default now

Co-authored-by: RedSpyy <empty@place.com>
2026-04-04 16:56:52 +02:00
Hitlinemoss edfc084441 Skeletons are now affected by Holy damage (#41757) 2026-04-04 16:56:52 +02:00
BarryNorfolk 489287970b Add pistol overrides for descriptions 2026-04-04 16:56:52 +02:00
BarryNorfolk 456c970f42 Move magazines still used by deltav over to our namespace 2026-04-04 16:56:52 +02:00
Hitlinemoss cbe5c81070 Assorted minor cleanup (and shotgun shell descriptions) in Resources\Prototypes\Entities\Objects\Weapons\Guns\Ammunition\ (#41841)
* YAML cleanup of shotgun rounds

* Descriptions for all shotgun ammo types

* YAML cleanup of pistol rounds

* YAML cleanup of magnum rounds (and tweaks to uranium ammo descriptions)

* YAML cleanup of rifle rounds

* YAML cleanup of toy rounds

* YAML cleanup of magnum/pistol/rifle/shotgun projectiles

* YAML cleanup of magnum/pistol/toy speedloaders

* YAML cleanup of light rifle rounds

* Descriptions for anti-materiel rounds and boxes

* YAML cleanup of base_cartridge.yml

* YAML cleanup of caseless rounds (plus minor viper-mag description tweaks)

* YAML cleanup of heavy rifle rounds

* YAML cleanup of grenades and explosives

* machine pistol magazine is now Security contraband

* Practice ammunition description updates

* Missed a magnum ammo description tweak

* Whoops, misspelled the word 'description' a lot

* Practice ammunition description updates 2!

* Better name/description for joke L6 foam dart mag

* Tweak to that last commit

* Fixed practice machine pistol magazines using real bullets
2026-04-04 16:56:52 +02:00
BarryNorfolk c2dffca063 Update some magazines to use new stripes and inhand sprites where possible 2026-04-04 16:56:52 +02:00
Seam_Less 558ef54978 Magazine rsi Cleanup + Magazine Type Recolor (#37709) 2026-04-04 16:56:52 +02:00
K-Dynamic 4890d47093 Take 2: Rename ammunition box (.50), Liberation Station .50 stock (#35326)
ammunition box (.50), .50 shell pellet

also die robust toolbox commits
2026-04-04 16:56:52 +02:00
Borsh 0b2c9671d6 Adding a random gate (#41627)
* Added random gate

* minor edit

* cleaning up my shit after trying to do something faster

* new lines

* some changes

* joke

* UI

* Long Division

* Dont use ctrl + x in 3 am

* I hope these are the final touches

* One thing, I don't know why

* noname commit

* no way, 1kk of code lines edit

* sudo rm -rf ... and something there...

* update

* sometimes its sad
2026-04-04 16:56:52 +02:00
Mehnix 9ce1ce5be5 Edible Produce are now also Butcherable (#36786)
Butcherable Produce

Adds Butcherable capabilities to Bananas, Mimanas, Corn, Gatfruit, Capfruit, Bungo, and Cherries.

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:56:52 +02:00
ScarKy0 de23957918 Killsign cleanup (#41845)
* init

* rsi

* review

* scale

* it

* cat, dog, nerd

* rsi

* I just microbalanced animation speed

* raider, stinky resprite

* review

* HideFromOwner

* hidden smite

* copyright

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:56:52 +02:00
āda a62ac0dce5 All Figurines Entity Table (#41775)
* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:56:52 +02:00
K-Dynamic 0824c48bd6 Preserve arbitrage by fixing a bug (#41756)
no more infinite money
2026-04-04 16:56:51 +02:00
Connor Huffine fc94af3e7e Add KI pills to the radsuit locker (#41576)
* Add KI pills

* Add variability

* Remove unnecessary value
2026-04-04 16:56:51 +02:00
Tiniest Shark 71e251ec16 Re-sprite the Ripley (#41832)
newish ripley yay
2026-04-04 16:56:51 +02:00
cloudyskies 78185d637c diona are now less debilitated by rooting in blood (#41642)
* diona are now less debilitated by rooting in blood

* Rerun tests

* Rerun tests
2026-04-04 16:56:51 +02:00
Centronias b00a3ed23b Smart Fridges can contain anything edible (#41830)
I'm sure this will cause zero unintended consequences
2026-04-04 16:56:51 +02:00
āda 87dd6de9dd Soap, Banana peel, and Slip entity tables (#41783)
* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:56:51 +02:00