tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,239 Commits 3 Branches 5 Tags
a1e85c33edd2ab1e0d76ec2b2b58904870fc3ec6
Commit Graph

34239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Janet Blackquill
a1e85c33ed make cryostasis less powerful 2025-10-03 15:47:30 -04:00
Janet Blackquill
1667aba55f thusd heart rescaling 2025-10-03 15:46:05 -04:00
Janet Blackquill
065ac42398 Merge branch 'master' into offmed-staging 2025-10-03 15:40:07 -04:00
Janet Blackquill
677b79979a thusd lung damage 2025-10-03 15:39:36 -04:00
Tayrtahn
d8e005087c 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>
 2025-10-03 18:45:50 +00:00
Janet Blackquill
579ea90d49 thusd refactoring 2025-10-03 12:21:48 -04:00
kosticia
63c8dc572b nerf cheese prices, part 2: electronics (#38246) 
should work now
 2025-10-03 16:05:05 +00:00
kosticia
bf49e28999 nerf cheese prices, part 1: bedsheets (#38230) 
* bedsheet

* Revert "bedsheet"

This reverts commit f76aa18be169bf7daf1ce0e1bd937299827016fa.

* price

* mistake
 2025-10-03 16:03:16 +00:00
Leon Friedrich
d07527404c Suppress SharedMapSystem info logs in tests (#40592) 
* Supress informational `SharedMapSystem` logs in tests

* Why is the client like this
 2025-10-03 11:23:04 +00:00
Kowlin
46960c0315 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>
 2025-10-03 11:20:18 +00:00
MilenVolf
3dacdc03c6 Localize space villain arcade (#40641) 2025-10-03 11:08:36 +00:00
āda
d92ebd222a Document tags.yml: A and B (#40673) 
* fix alphabetization

* the letter A

* the letter B

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-10-03 09:58:29 +00:00
Pieter-Jan Briers
9c65777246 You can now stuff the nuke disk in plushies (#40674) 
Because there's no reason you shouldn't be able to.

Fixes #40669
 2025-10-03 09:42:18 +00:00
Myra
9672cd88fb Remove x86 targets from Content Packaging (#40664) 
They don't compile and even if they did, I doubt they would work.
 2025-10-03 07:10:05 +00:00
Janet Blackquill
b1abd81c54 Changelog 2025-10-02 22:05:39 -04:00
Janet Blackquill
2c361352ee Basic medication pass 2025-10-02 21:53:57 -04:00
Janet Blackquill
bdee926c80 Supply basic medications in NanoMeds 2025-10-02 21:52:16 -04:00
Janet Blackquill
5eba556365 Make dylovene on the medibelt roundstart 2025-10-02 21:51:55 -04:00
Janet Blackquill
6497a44d43 Pills can be inserted into syringes now 2025-10-02 21:51:07 -04:00
Janet Blackquill
09cc936b4a Make Offbrand critical count for reagent criticals 2025-10-02 21:47:34 -04:00
Janet Blackquill
6db63c92a5 Guidebook redescriptionings 2025-10-02 21:05:08 -04:00
āda
24b661ddd7 Smuggler Satchel Heisen (#40665) 
* heisenburger

* fix

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-10-03 00:55:00 +00:00
Janet Blackquill
68d3af3d12 Merge branch 'master' into offmed-staging 2025-10-02 20:36:12 -04:00
Janet Blackquill
8606c69032 Make softcrit harder 2025-10-02 20:17:46 -04:00
Janet Blackquill
d7b2e1fc49 Make convermol nicer 2025-10-02 20:17:40 -04:00
Janet Blackquill
db8cb00b7e Fix medipen not dosing the whole thing 2025-10-02 20:17:34 -04:00
Archee
3db18aa7b2 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>
 2025-10-02 22:35:48 +00:00
lzk
bfc65b1554 some entities name fixes (#40663) 2025-10-02 21:16:35 +00:00
kosticia
9b7c87bd7e 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>
 2025-10-02 20:00:39 +00:00
slarticodefast
bf5fccbbe9 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>
 2025-10-02 20:16:26 +02:00
Zeneganto
47c79dca67 Fix lockbox ERRORing (#40642) 
bruh
 2025-10-02 17:04:43 +00:00
Princess Cheeseballs
07c7d6284e [HOTFIX] Fix Antags failing to roll. (#40658) 
Use TryGetCached instead of GetCached

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-10-02 18:52:07 +02:00
Leon Friedrich
de9593c0e7 Remove static IoC from client & server EntryPoint (#40562) 
* Remove static IoC from client & server EntryPoint

* Fix missing log manager initialization

* file namespace
 2025-10-02 14:32:56 +00:00
Schuyler Duryee
368d4dd273 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
 2025-10-02 08:51:20 +00:00
Janet Blackquill
a11b3912dd thusd changelog 2025-10-01 21:12:43 -04:00
Janet Blackquill
c9bfa97555 Combat medipen has coagulant now 2025-10-01 21:11:07 -04:00
Janet Blackquill
8d8d1c36ef Merge branch 'master' into offmed-staging 2025-10-01 21:06:50 -04:00
Janet Blackquill
9bb09ae01b The chems update 2025-10-01 21:06:40 -04:00
Princess Cheeseballs
aeb52a661c STABLE INTO MASTER (#40648) 
Disable panic bunker for Leviathan (#40646)

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
 2025-10-01 17:07:10 -07:00
crazybrain23
d5aae3dada Disable panic bunker for Leviathan (#40646) 2025-10-01 16:54:21 -07:00
Janet Blackquill
8626e82a79 The nukies update 2025-10-01 19:48:39 -04:00
Mixelz
f660964006 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
 2025-10-01 23:11:26 +00:00
Janet Blackquill
6dafd77fe9 Health analyzer has tooltips now 2025-10-01 18:33:44 -04:00
K-Dynamic
9828f165b4 Increase puddle spillover volume to 50u (#38044) 
* increase puddle spillover volume

* sleepy; 50u volume
 2025-10-01 20:17:31 +00:00
YoungThug
f87234d4d8 Prisoner Eva Suit is now an Emergency Eva Suit (#36696) 
* :3

* :3 The Second

* :3 the third
 2025-10-01 20:12:44 +00:00
Velcroboy
13294a951a Adds default "Toggle" to "Status" linking port (#37690) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2025-10-01 20:11:27 +00:00
Varen
37ee54621a Allow multitool device saving on devices with wireless (#38938) 
-Device network list will not override device linking anymore if existing
 2025-10-01 19:59:28 +00:00
Fildrance
c95bf3f94f fix: scan for ShowAccessReaderSettingsComponent on examiner and not on airlock (#40626) 
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2025-10-01 11:43:21 +00:00
Sender
b6bbb5d1b4 Stage Name For Musicians (#40640) 
added stage name for musicians
 2025-10-01 11:35:29 +00:00
Mixelz
faf8881a87 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.
 2025-10-01 06:15:14 +00:00