]> git.smokeofanarchy.ru Git - space-station-14.git/log
space-station-14.git
2 months agoAutomatic changelog update
PJBot [Thu, 2 Oct 2025 20:12:38 +0000 (20:12 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Thu, 2 Oct 2025 09:03:57 +0000 (09:03 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Wed, 1 Oct 2025 23:23:45 +0000 (23:23 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Wed, 1 Oct 2025 20:29:24 +0000 (20:29 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Wed, 1 Oct 2025 20:24:48 +0000 (20:24 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Wed, 1 Oct 2025 11:47:45 +0000 (11:47 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Wed, 1 Oct 2025 04:06:56 +0000 (04:06 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Tue, 30 Sep 2025 21:56:21 +0000 (21:56 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Tue, 30 Sep 2025 03:46:36 +0000 (03:46 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Mon, 29 Sep 2025 10:29:55 +0000 (10:29 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Sun, 28 Sep 2025 18:34:40 +0000 (18:34 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Sun, 28 Sep 2025 03:44:11 +0000 (03:44 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Sun, 28 Sep 2025 03:26:49 +0000 (03:26 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Sat, 27 Sep 2025 21:22:14 +0000 (21:22 +0000)]
Automatic changelog update

2 months agoAutomatic changelog update
PJBot [Sat, 27 Sep 2025 20:53:00 +0000 (20:53 +0000)]
Automatic changelog update

2 months agoPrioritize spoon mixing over drinking (#40704)
Centronias [Sun, 5 Oct 2025 22:00:33 +0000 (15:00 -0700)]
Prioritize spoon mixing over drinking (#40704)

* no, I can't use a spoon to drink a drink.

* Update Content.Server/Chemistry/EntitySystems/ReactionMixerSystem.cs

2 months agoDocument tags: C - F (#40711)
āda [Sun, 5 Oct 2025 21:09:53 +0000 (16:09 -0500)]
Document tags: C - F (#40711)

* one step forward

* the letter C

* some of D

* the letter D

* the letter E

* the letter F

* stay in scope don't stray

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2 months agofix edge case typing indicator error (#40708)
mq [Sun, 5 Oct 2025 20:58:46 +0000 (07:58 +1100)]
fix edge case typing indicator error (#40708)

* cleanup rsi error in typingindicatorvisualizersystem

* sprite fix

2 months agoFix species default skin tones (#40707)
Absotively [Sun, 5 Oct 2025 20:53:58 +0000 (14:53 -0600)]
Fix species default skin tones (#40707)

fix so that all default Urist entities don't spawn with the same default human skin tone (cursed skin tone Urist McSlime)

(cherry picked from commit 8d9564c23856c342bc3a35834c462e659f5ebd5b)

Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
2 months agoAdd Arrivals sign (#40227)
SlamBamActionman [Sun, 5 Oct 2025 15:44:29 +0000 (17:44 +0200)]
Add Arrivals sign (#40227)

* Arrivals sign

* Waving!!!

* Attribution

2 months agoUpdate Credits (#40706)
github-actions[bot] [Sun, 5 Oct 2025 15:05:25 +0000 (17:05 +0200)]
Update Credits (#40706)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2 months agoIncendiary rounds do pierce (#39204)
Princess Cheeseballs [Sun, 5 Oct 2025 08:27:19 +0000 (01:27 -0700)]
Incendiary rounds do pierce (#39204)

* Incendiary rounds do pierce

* Address review

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2 months agoIan Suit gives accent! (#40694)
NoreUhh [Sun, 5 Oct 2025 07:55:17 +0000 (00:55 -0700)]
Ian Suit gives accent! (#40694)

Ian suit has been made STRONGERgit add Resources/Prototypes/Entities/Clothing/OuterClothing/suits.ymlgit add Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml

Co-authored-by: NoreUhh <noreuhh@gmail.com>
2 months agoAdd high severity logging to stun prods (#40709)
Kowlin [Sun, 5 Oct 2025 07:29:28 +0000 (09:29 +0200)]
Add high severity logging to stun prods (#40709)

2 months agomade evac signs glow (#38545)
Moomoobeef [Sat, 4 Oct 2025 20:16:27 +0000 (13:16 -0700)]
made evac signs glow (#38545)

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2 months agoExplosives with timers now properly alert admins when detonating (#40471)
beck-thompson [Sat, 4 Oct 2025 17:51:36 +0000 (10:51 -0700)]
Explosives with timers now properly alert admins when detonating (#40471)

* Explosives with timers now properly alert admins when detonating

* add TODO comment

* Check if user is deleted before triggering

2 months agoAdded Pride-O-Mat to marathon (#40696)
AwareFoxy [Sat, 4 Oct 2025 16:40:04 +0000 (19:40 +0300)]
Added Pride-O-Mat to marathon (#40696)

added Pride-O-Math to marathon

2 months agoVomitSystem, Predict! (#39921)
Kyle Tyo [Sat, 4 Oct 2025 11:57:24 +0000 (07:57 -0400)]
VomitSystem, Predict! (#39921)

* commit

* Update AdminVerbSystem.Smites.cs

* brrrrr

* reeeee

* skeet

* Update VomitSystem.cs

* didn't know i could do this.

* Update SharedForensicsSystem.cs

* Update SharedForensicsSystem.cs

* Update SharedForensicsSystem.cs

* Update ForensicsSystem.cs

* requested changes.

* Update VomitSystem.cs

* lets try this.

2 months agoPredict EMPs (#39802)
slarticodefast [Sat, 4 Oct 2025 11:24:42 +0000 (13:24 +0200)]
Predict EMPs (#39802)

* predicted emps

* fixes

* fix

* review

2 months agoAdd integration test for the RCD (#40625)
slarticodefast [Sat, 4 Oct 2025 10:18:38 +0000 (12:18 +0200)]
Add integration test for the RCD (#40625)

* rcd test

* fixes

* fix

* space

* review

2 months agoAdds smart equip to pocket 1, pocket 2, and suit storage slots (#37975)
K-Dynamic [Sat, 4 Oct 2025 01:33:59 +0000 (14:33 +1300)]
Adds smart equip to pocket 1, pocket 2, and suit storage slots (#37975)

* pockets and exosuit smartequip

* add localisation

2 months agoFix xenoarch exceptions + misc. cleanup (#38742)
Nemanja [Sat, 4 Oct 2025 00:05:04 +0000 (20:05 -0400)]
Fix xenoarch exceptions + misc. cleanup (#38742)

2 months agoCyborg Martyr Module Free Hand Fix (#40224)
NoreUhh [Fri, 3 Oct 2025 23:23:12 +0000 (16:23 -0700)]
Cyborg Martyr Module Free Hand Fix (#40224)

* Added and attached tags for BorgGrenade, whitelisted borg hand, added Unremoveable to selfdestructseq.

* Added locales, fixed labels.

* Update borg_modules.yml

I fricked up, its fixed

* Update borg_modules.ftl

Removed Self Destruct label

* Update tags.yml

Removed tag: BorgGrenade

* Update borg_modules.yml

Removed hand whitelist because it hates my guts

* Update grenades.yml

Removed the BorgGrenade tag, made the explosive component repeatable and removed delete after explosion

---------

Co-authored-by: NoreUhh <noreuhh@gmail.com>
2 months agoFix PDA point lights (#40687)
Crude Oil [Fri, 3 Oct 2025 20:22:40 +0000 (22:22 +0200)]
Fix PDA point lights (#40687)

tweak pda point light

2 months agoAdd interaction tests for mousetraps (#35502)
Tayrtahn [Fri, 3 Oct 2025 18:45:50 +0000 (14:45 -0400)]
Add interaction tests for mousetraps (#35502)

* Add interaction tests for mousetraps

* Silly yaml linter

* review

* fix debugging thing

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2 months agonerf cheese prices, part 2: electronics (#38246)
kosticia [Fri, 3 Oct 2025 16:05:05 +0000 (19:05 +0300)]
nerf cheese prices, part 2: electronics (#38246)

should work now

2 months agonerf cheese prices, part 1: bedsheets (#38230)
kosticia [Fri, 3 Oct 2025 16:03:16 +0000 (19:03 +0300)]
nerf cheese prices, part 1: bedsheets (#38230)

* bedsheet

* Revert "bedsheet"

This reverts commit f76aa18be169bf7daf1ce0e1bd937299827016fa.

* price

* mistake

2 months agoSuppress `SharedMapSystem` info logs in tests (#40592)
Leon Friedrich [Fri, 3 Oct 2025 11:23:04 +0000 (00:23 +1300)]
Suppress `SharedMapSystem` info logs in tests (#40592)

* Supress informational `SharedMapSystem` logs in tests

* Why is the client like this

2 months agoConditional Meat spike logging severity (#40604)
Kowlin [Fri, 3 Oct 2025 11:20:18 +0000 (13:20 +0200)]
Conditional Meat spike logging severity (#40604)

* Reduce meatspike logging level from Extreme to High on non gibbing interactions

* Update butchering with some more conditionals

* Update Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
* Update Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs

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

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
2 months agoLocalize space villain arcade (#40641)
MilenVolf [Fri, 3 Oct 2025 11:08:36 +0000 (14:08 +0300)]
Localize space villain arcade (#40641)

2 months agoDocument tags.yml: A and B (#40673)
āda [Fri, 3 Oct 2025 09:58:29 +0000 (04:58 -0500)]
Document tags.yml: A and B (#40673)

* fix alphabetization

* the letter A

* the letter B

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2 months agoYou can now stuff the nuke disk in plushies (#40674)
Pieter-Jan Briers [Fri, 3 Oct 2025 09:42:18 +0000 (11:42 +0200)]
You can now stuff the nuke disk in plushies (#40674)

Because there's no reason you shouldn't be able to.

Fixes #40669

2 months agoRemove x86 targets from Content Packaging (#40664)
Myra [Fri, 3 Oct 2025 07:10:05 +0000 (09:10 +0200)]
Remove x86 targets from Content Packaging (#40664)

They don't compile and even if they did, I doubt they would work.

2 months agoSmuggler Satchel Heisen (#40665)
āda [Fri, 3 Oct 2025 00:55:00 +0000 (19:55 -0500)]
Smuggler Satchel Heisen (#40665)

* heisenburger

* fix

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2 months agoMaterial Door rebalancing (#36597)
Archee [Thu, 2 Oct 2025 22:35:48 +0000 (23:35 +0100)]
Material Door rebalancing (#36597)

* refactors in material_doors.yml,
lowers destructible thresholds on most doors,
changes damageable modifiers for doors lowering their resistances,
adds partial material drops to doors being destroyed

* adds poster break sound to paper door breaking

* merge conflicts

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2 months agosome entities name fixes (#40663)
lzk [Thu, 2 Oct 2025 21:16:35 +0000 (23:16 +0200)]
some entities name fixes (#40663)

2 months agoFix anomaly shuffle particles type (#40624)
kosticia [Thu, 2 Oct 2025 20:00:39 +0000 (23:00 +0300)]
Fix anomaly shuffle particles type (#40624)

* dev it

* screw it

* Revert "screw it"

This reverts commit 5657a1d20128e630bebbaf38f4dcb4dbac28d026.

* Revert "dev it"

This reverts commit f3d7c355da17de92e43c145efbd348f8378d6146.

* slarti best

* Revert "slarti best"

This reverts commit 8de1caafb254515202aa21d2b96029a1fce24df2.

* Reapply "dev it"

This reverts commit c603940a73246f8a22a171c5559eb3f3f995e7bc.

* Reapply "screw it"

This reverts commit 468722abe7bde7e30bc3b421bc28fa90a013bd63.

* refactor: renaming +xml-doc

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2 months agoStable -> master (#40662)
slarticodefast [Thu, 2 Oct 2025 18:16:26 +0000 (20:16 +0200)]
Stable -> master (#40662)

[HOTFIX] Fix Antags failing to roll. (#40658)

Use TryGetCached instead of GetCached

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2 months agoFix lockbox ERRORing (#40642)
Zeneganto [Thu, 2 Oct 2025 17:04:43 +0000 (03:04 +1000)]
Fix lockbox ERRORing (#40642)

bruh

2 months ago[HOTFIX] Fix Antags failing to roll. (#40658)
Princess Cheeseballs [Thu, 2 Oct 2025 16:52:07 +0000 (09:52 -0700)]
[HOTFIX] Fix Antags failing to roll. (#40658)

Use TryGetCached instead of GetCached

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2 months agoRemove static IoC from client & server EntryPoint (#40562)
Leon Friedrich [Thu, 2 Oct 2025 14:32:56 +0000 (03:32 +1300)]
Remove static IoC from client & server EntryPoint (#40562)

* Remove static IoC from client & server EntryPoint

* Fix missing log manager initialization

* file namespace

2 months agoAdd utility knife/box cutter (#39567)
Schuyler Duryee [Thu, 2 Oct 2025 08:51:20 +0000 (01:51 -0700)]
Add utility knife/box cutter (#39567)

* add sprites for box cutter

* move box cutter to melee, add yaml

* remove unneeded soundHit yaml

* add opening sound effect to box cutter

* modify sprites to look more like actual box cutters

* add BoxCutter tag and add to belts

* rename box cutter to utility knife

* remove accidental backtick

* move utility knife to correct place in tags

* remove SECOND accidental backtick??

* Fix utility knife arbitrage by reducing steel to 50

* Reduce damage to 4

* Reduce knife bounty reward to $2000

* modify utility knife icon to be larger

* Make utility knife extendable/retractable

* move slicing out of ComponentToggler

* change utility knife extend/retract sound

* Use TiniestShark's larger inhand images for utility knife

* utilty knife is now only Slicing when activated

2 months agoSTABLE INTO MASTER (#40648)
Princess Cheeseballs [Thu, 2 Oct 2025 00:07:10 +0000 (17:07 -0700)]
STABLE INTO MASTER (#40648)

Disable panic bunker for Leviathan (#40646)

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
2 months agoDisable panic bunker for Leviathan (#40646)
crazybrain23 [Wed, 1 Oct 2025 23:54:21 +0000 (00:54 +0100)]
Disable panic bunker for Leviathan (#40646)

2 months agoOrganized Head Locker Fills Feat. Circuit Totes. (#39868)
Mixelz [Wed, 1 Oct 2025 23:11:26 +0000 (18:11 -0500)]
Organized Head Locker Fills Feat. Circuit Totes. (#39868)

* Initial Commit

Added Circuit Totes, replaced Head Locker fills with Tote fills, also stamp boxes for relevant heads.

* Craftable!

Now craftable: Uses 1 cardboard and 1 cloth (gotta keep the circuits cushioned!)

* Various Fixes

Fixed indenting, added comments, fixed names, tried for 5 hours to get the table fill to work, failed.

* test fail fix

aaaaaaaa

* TEST FAIL WHYYYY

AAAAAAAAAAAAAAAAAAAAA

* test fail fix 3 feat. iaada

*mothscream.oog*

* SURPLUS BOARD USES TOTE NOW

THANK YOU IAADA

* indent fix & storage base fix

Fix for indents and also the storagebase bug

* Master Merge Fix

* Update meta.json

* forgor the important part

2 months agoIncrease puddle spillover volume to 50u (#38044)
K-Dynamic [Wed, 1 Oct 2025 20:17:31 +0000 (09:17 +1300)]
Increase puddle spillover volume to 50u (#38044)

* increase puddle spillover volume

* sleepy; 50u volume

2 months agoPrisoner Eva Suit is now an Emergency Eva Suit (#36696)
YoungThug [Wed, 1 Oct 2025 20:12:44 +0000 (13:12 -0700)]
Prisoner Eva Suit is now an Emergency Eva Suit (#36696)

* :3

* :3 The Second

* :3 the third

2 months agoAdds default "Toggle" to "Status" linking port (#37690)
Velcroboy [Wed, 1 Oct 2025 20:11:27 +0000 (15:11 -0500)]
Adds default "Toggle" to "Status" linking port (#37690)

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2 months agoAllow multitool device saving on devices with wireless (#38938)
Varen [Wed, 1 Oct 2025 19:59:28 +0000 (21:59 +0200)]
Allow multitool device saving on devices with wireless (#38938)

-Device network list will not override device linking anymore if existing

2 months agofix: scan for ShowAccessReaderSettingsComponent on examiner and not on airlock (...
Fildrance [Wed, 1 Oct 2025 11:43:21 +0000 (14:43 +0300)]
fix: scan for ShowAccessReaderSettingsComponent on examiner and not on airlock (#40626)

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2 months agoStage Name For Musicians (#40640)
Sender [Wed, 1 Oct 2025 11:35:29 +0000 (07:35 -0400)]
Stage Name For Musicians (#40640)

added stage name for musicians

2 months agoAmbrosia/Glasstle Prototype Bugfix (#40639)
Mixelz [Wed, 1 Oct 2025 06:15:14 +0000 (01:15 -0500)]
Ambrosia/Glasstle Prototype Bugfix (#40639)

* Prototype Parity

Ensured Ambrosia/Glasstle prototypes are in parity with their seeds.

* Comment Fix

Change to Max Volume to match new output.

2 months agomoved desoxyephedrine from ambrosia to glasstle (#40638)
Leah [Wed, 1 Oct 2025 03:54:56 +0000 (05:54 +0200)]
moved desoxyephedrine from ambrosia to glasstle (#40638)

Co-authored-by: Georg Stuewe <georg.stuewe@uni-konstanz.de>
2 months agoMinor change to the Hydra description (#40629)
Minerva [Tue, 30 Sep 2025 23:38:25 +0000 (19:38 -0400)]
Minor change to the Hydra description (#40629)

2 months agoTypofixes and rephrases a bunch of job descriptions (#40634)
Minerva [Tue, 30 Sep 2025 23:17:37 +0000 (19:17 -0400)]
Typofixes and rephrases a bunch of job descriptions (#40634)

* Typofixes and rephrases a bunch of job descriptions

* I am not immune to making typos while typofixing

2 months agoMinor typofix for the experiment plushie description (#40635)
Minerva [Tue, 30 Sep 2025 23:16:02 +0000 (19:16 -0400)]
Minor typofix for the experiment plushie description (#40635)

Typofix for the experiment plushie description

2 months agoTwo bounty typo fixes (#40633)
Minerva [Tue, 30 Sep 2025 22:24:09 +0000 (18:24 -0400)]
Two bounty typo fixes (#40633)

* Two bounty typo fixes

* Wait I phrased that weirdly

2 months agoFixes a typo in the leaking SUPERPACMAN description (#40628)
Minerva [Tue, 30 Sep 2025 22:08:28 +0000 (18:08 -0400)]
Fixes a typo in the leaking SUPERPACMAN description (#40628)

2 months agoFixes conveyer typos (#40627)
Minerva [Tue, 30 Sep 2025 22:08:01 +0000 (18:08 -0400)]
Fixes conveyer typos (#40627)

Fixes conveyer typo

2 months agoRephrases two Whistle descriptions (#40631)
Minerva [Tue, 30 Sep 2025 22:07:11 +0000 (18:07 -0400)]
Rephrases two Whistle descriptions (#40631)

Rephrases the Whistle descriptions

2 months agoHit 'em with the Michaelwave (#40618)
Spanky [Tue, 30 Sep 2025 21:55:10 +0000 (17:55 -0400)]
Hit 'em with the Michaelwave (#40618)

* michaelwave

* Add DamageOnHit to microwaves

* Un-offset the sprite files and add offset component.

2 months agoUpdated Elkridge burn chambers (#40590)
Absotively [Tue, 30 Sep 2025 03:45:17 +0000 (21:45 -0600)]
Updated Elkridge burn chambers (#40590)

* updated Elkridge burn chambers

* set correct inlet pressure regulator pressure

* Remove invalid reference

* move TEG, various pipes, machine frame

* reconnect the firelock I deleted and rebuilt to air alarms

2 months agoMake file dialog API usages read-only (#37779)
Pieter-Jan Briers [Mon, 29 Sep 2025 15:51:09 +0000 (17:51 +0200)]
Make file dialog API usages read-only (#37779)

Requires https://github.com/space-wizards/RobustToolbox/commit/4e7de2f272cafc687c775fceb16b88681fcfd7e3

Fixes #37762

2 months agoFix chess dimension smite (#40583)
Jessica M [Mon, 29 Sep 2025 15:29:33 +0000 (08:29 -0700)]
Fix chess dimension smite (#40583)

turns out it works fine if you just keep physicscomponent

Co-authored-by: Jessica M <jessica@maybe.sh>
2 months agoFix Shotgun ammocount not updating (#40568)
Sir Warock [Mon, 29 Sep 2025 10:28:28 +0000 (12:28 +0200)]
Fix Shotgun ammocount not updating (#40568)

2 months agoAdd logging for additional grilles (#40603)
Kowlin [Mon, 29 Sep 2025 10:14:19 +0000 (12:14 +0200)]
Add logging for additional grilles (#40603)

Add logging for missing grille events.

2 months agoFix label markup escapeing (#40600)
beck-thompson [Sun, 28 Sep 2025 18:33:11 +0000 (11:33 -0700)]
Fix label markup escapeing (#40600)

fix

2 months agoReplace outdated tip 79 about artifact scanners (#40597)
Stefano Pigozzi [Sun, 28 Sep 2025 16:37:13 +0000 (18:37 +0200)]
Replace outdated tip 79 about artifact scanners (#40597)

Co-authored-by: Steffo99 <1540885+Steffo99@users.noreply.github.com>
2 months agoClean up some parts of ExplosionSystem (#40485)
Leon Friedrich [Sun, 28 Sep 2025 16:23:40 +0000 (05:23 +1300)]
Clean up some parts of ExplosionSystem (#40485)

* Clean up some parts of ExplosionSystem

* Update Content.Shared/Damage/DamageSpecifier.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2 months agoEmpty commit (stable merge) (#40599)
Myra [Sun, 28 Sep 2025 16:14:01 +0000 (18:14 +0200)]
Empty commit (stable merge) (#40599)

2 months agoEmpty commit
Vasilis The Pikachu [Sun, 28 Sep 2025 15:54:18 +0000 (17:54 +0200)]
Empty commit

2 months agoRemoves Taser Bolt Damage & Allows Tasers to be used by Pacifists (#40588)
keronshb [Sun, 28 Sep 2025 03:42:46 +0000 (23:42 -0400)]
Removes Taser Bolt Damage & Allows Tasers to be used by Pacifists (#40588)

* Removes damage from the taser bolt

* Allows tasers to be used by pacified players

* Sets the taser damage to 0 or else it'll inherit damage

2 months agoMake vulp gasps and deathgasps audible (#40579)
SurrealShibe [Sun, 28 Sep 2025 03:25:22 +0000 (20:25 -0700)]
Make vulp gasps and deathgasps audible (#40579)

* let their suffering be heard

* revert vox change in favor of #39914

* revert formatting changes

* do a better job at reverting formatting

2 months agoAdded Vox Mime Hardsuit Sprite (#40567)
Mora [Sun, 28 Sep 2025 02:22:16 +0000 (21:22 -0500)]
Added Vox Mime Hardsuit Sprite (#40567)

* Added Vox Mime Hardsuit

* missing pixels fix

* fixed pixel on hardsuit sprite

* updated vox mime helmet sprite

* made tip slightly smaller

* Add Attribution

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2 months agoUpdate Credits (#40586)
github-actions[bot] [Sun, 28 Sep 2025 00:47:01 +0000 (02:47 +0200)]
Update Credits (#40586)

Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2 months agoReadds Tasers to Security (#39087)
keronshb [Sat, 27 Sep 2025 21:21:03 +0000 (17:21 -0400)]
Readds Tasers to Security (#39087)

* Readds taser to security

* removes item drop from regular tasers, adds item drop to admeme tasers

* Fixes stun on collide options

* Fixes drop

* Lowers fire rate for taser

2 months agoEdible Verb Fixes (#39933)
Princess Cheeseballs [Sat, 27 Sep 2025 21:20:31 +0000 (14:20 -0700)]
Edible Verb Fixes (#39933)

* You cannot drink the cannot drink

* Undo that shit

* Whoops

* Fix test fails

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2 months agoSalv Instrument Spawn Rework (#40572)
Sender [Sat, 27 Sep 2025 20:51:35 +0000 (16:51 -0400)]
Salv Instrument Spawn Rework (#40572)

added salv table + replaced instrument table

2 months agoNew GitHub issue templates (#39979)
Kowlin [Sat, 27 Sep 2025 18:36:47 +0000 (20:36 +0200)]
New GitHub issue templates (#39979)

* Remove the duplicate security issue link.
Since there is a security.md file present in the repo GitHub will automatically link to that when someone tries to create a new issue.

* Remove a practically unused issue template

* Initial commit of the new yml issue template

* delete the older issue template.

* Initial commit for the mapping issue template

* Fix the template names... potato...

* And the description...

* Removed the automatic labeling

2 months agoAutomatic changelog update
PJBot [Sat, 27 Sep 2025 17:02:22 +0000 (17:02 +0000)]
Automatic changelog update

2 months agoMore Vox Sounds (#39914)
Mora [Sat, 27 Sep 2025 17:01:14 +0000 (12:01 -0500)]
More Vox Sounds (#39914)

* Added more vox sounds

WHY IS IT ORGANIZED THIS WAY.

* Fix incorrect license fields

* License fix

* move vox_gasp.ogg to gasps

* Update Attributions

* Update attributions.yml

* file path fix

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Update attributions.yml

* Standardize Attributions, fixed sources

* Adjusted Vox DeathGasp and sigh to be more auditorily distinct from one-another

* Made vox gasp slightly faster

2 months agoAutomatic changelog update
PJBot [Sat, 27 Sep 2025 10:20:38 +0000 (10:20 +0000)]
Automatic changelog update

2 months agoStunned Status and Knockdown Meth fix. (#39547)
Princess Cheeseballs [Sat, 27 Sep 2025 10:19:30 +0000 (03:19 -0700)]
Stunned Status and Knockdown Meth fix.  (#39547)

* Init Commit

* Remove unused code, fix stun visuals bug

* Update Content.Shared/Stunnable/SharedStunSystem.cs

* Some initial changes

* first batch of changes

* Commit

* One line cleanup

* KnockdownStatusEffect ain't worth it.

* Fix 2 bugs

* Fixes

* Remove that actually,

* Maybe this?

* Meff fix

* Meff fix

* alert cleanup and API

* I expect update loops to be at the top.

* Fix LOC

* Address review

* Address review x 2

* Merg my PR

* Fix

* Update Content.Shared/Alert/AlertsSystem.cs

webedit

Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
* FIX THAT TEST FAIL!!!!

* Me when I forget to actually give you alerts

* Push

* Tests are not failing locally why are they dying on github???

* Fix test fails (real)

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
2 months agoAutomatic changelog update
PJBot [Sat, 27 Sep 2025 07:22:41 +0000 (07:22 +0000)]
Automatic changelog update

2 months agoVulp Plushie (#40303)
Princess Cheeseballs [Sat, 27 Sep 2025 07:21:29 +0000 (00:21 -0700)]
Vulp Plushie (#40303)

* Textures

* Plushie

* Fix sprites and add entity tables

* Copyright info

* Fix food sequence

* I'm dum

* head sprite update

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2 months agoAutomatic changelog update
PJBot [Fri, 26 Sep 2025 20:06:48 +0000 (20:06 +0000)]
Automatic changelog update

2 months agoMinor plushie.yml touchup (#40552)
āda [Fri, 26 Sep 2025 20:05:58 +0000 (15:05 -0500)]
Minor plushie.yml touchup (#40552)

* horrible commit discipline what else is new

* second pass

* conflict

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2 months agoAutomatic changelog update
PJBot [Fri, 26 Sep 2025 20:05:40 +0000 (20:05 +0000)]
Automatic changelog update

2 months agoAdd a sleep delay to Nocturine (NewStatusEffect version) (#40231)
SlamBamActionman [Fri, 26 Sep 2025 20:05:34 +0000 (22:05 +0200)]
Add a sleep delay to Nocturine (NewStatusEffect version) (#40231)

* Initial commit

* Minor fix

* Why is this uncommented here? Hmmm

* No wait this can't be here, oops

* Do better time

* Also guidebook

* Review changes

* Add rejuvination, fix mispredicts

2 months agoMake Closets Less Tanky Than Gun Safes (#35671)
CraftyRenter [Fri, 26 Sep 2025 20:04:32 +0000 (15:04 -0500)]
Make Closets Less Tanky Than Gun Safes (#35671)

* Reduce ClosetBase's DamageTrigger to 50 from 150.

* Increased LockerBase's DamageTrigger to 75, doubled LockerBaseSecure's DamageTrigger

This and the previous commit aim to improve health scaling of storage closets with their intended level of security. The
damage scale is as follows:

Inheritors of ClosetBase:       50 (old 150)
Inheritors of LockerBase:       75 (old 50)
Inheritors of LockerBaseSecure: 150 (old 75)

I left suit lockers alone because visually they look the tankiest of the lockers, though it may make sense to have them
in between secure lockers and regular lockers.

* COMMIT

---------

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