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

34367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Janet Blackquill
173f24590f resimmed offmed 2025-10-08 20:49:29 -04:00
Janet Blackquill
847154b320 Merge branch 'master' into offmed-staging 2025-10-08 20:45:21 -04:00
PJBot
ef0c9ecc63 Automatic changelog update 2025-10-08 23:47:04 +00:00
ToastEnjoyer
72852accbe Remove enforcer from fland (#40786) 2025-10-08 23:34:48 +00:00
PJBot
61f7d3438d Automatic changelog update 2025-10-08 22:29:05 +00:00
Centronias
c54fb47f7c Wrapped Parcels can be labelled with Papers (#40783) 
* labels

* oop

* Update Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml
 2025-10-08 22:17:11 +00:00
PJBot
6a3a54535b Automatic changelog update 2025-10-08 22:00:47 +00:00
SlamBamActionman
df6307fe66 Allow more energy projectiles to hit holo creatures (#40782) 
* Allow more energy projectiles to hit holo creatures.

* Disabler SMG
 2025-10-08 21:48:52 +00:00
PJBot
0039dff91f Automatic changelog update 2025-10-08 20:42:56 +00:00
ToastEnjoyer
02ada04eb4 Removed wardens enforcer from box (#40785) 
box shotgun gone :dejected:
 2025-10-08 20:30:16 +00:00
PJBot
d3771a19e2 Automatic changelog update 2025-10-08 17:01:09 +00:00
Vortebo
3f2a58a157 Relic fixes and tweaks (#40537) 
* Various adjustments

* More accurate floors

* Changes

* This should be good

* Logic
 2025-10-08 16:48:07 +00:00
opl-
0805943c98 Fix wizard can teleport into the ATS wall (#40755) 
Co-authored-by: opl <4833621+opl@users.noreply.github.com>
 2025-10-08 16:45:28 +00:00
PJBot
c566b17da7 Automatic changelog update 2025-10-08 15:50:29 +00:00
Hitlinemoss
f80f322357 Added folders and clipboards to trinkets tab (#39920) 
* Added folders to trinkets tab

* Fixed loadout grouping

* Added plastic clipboards to trinkets

* Whoops, forgot to create BoxFolderPlasticClipboardThreePapers prototype

* Added regular clipboards as trinkets (1 hour of command required)

* Reduced folder bloat
 2025-10-08 15:37:34 +00:00
PJBot
e7f1d67df0 Automatic changelog update 2025-10-08 15:24:10 +00:00
K-Dynamic
1b62863e52 Fix: Allow energy shotgun lethal projectiles to hit holos (#37920) 
BulletLaser opaque mask
 2025-10-08 15:03:12 +00:00
PJBot
2a5a72d5bd Automatic changelog update 2025-10-08 15:11:27 +00:00
YoungThug
92082f8091 Fix the temperature gun not reflecting and going through windows (#37581) 
* Fix Temp Gun

* Fix mask, muzzle flash

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-10-08 14:59:36 +00:00
slarticodefast
7cdd8cb2a9 Add disclaimer about AI generated content to Readme.md (#39334) 
* Add disclaimer about AI generated content to Readme.md

* Update README.md

* rephrase
 2025-10-08 14:50:23 +00:00
āda
41c7229b9d cleanup and reorganize belts.yml (#40773) 
commit discipline? Never heard of it

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-10-08 14:14:49 +00:00
PJBot
4f93089e42 Automatic changelog update 2025-10-08 14:12:08 +00:00
UpAndLeaves
91aa169784 Slightly re-nerf zombification speed (#37445) 
Initial Commit
 2025-10-08 13:57:55 +00:00
PJBot
532564e05f Automatic changelog update 2025-10-08 13:59:45 +00:00
āda
68b3c7a520 Clean up bucket.yml (#40772) 
SMASH that bucket

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-10-08 13:48:00 +00:00
B_Kirill
0c9d33d5d6 Cleanup warnings: CS0414, CS8524 (#40776) 
* Cleanup

* CS8524
 2025-10-08 12:43:59 +00:00
PJBot
44563dafdc Automatic changelog update 2025-10-08 11:31:38 +00:00
Archee
3f115fa1d4 Fix- Cobras killing adders (#37424) 
* fixed

* adds SimpleHostile to SpaceAdder (the stealth snake)

* whoops i branched this off a branch not master

This reverts commit fe1562581f91a113950cfedd284a1790e51a48e6.
 2025-10-08 11:19:17 +00:00
Janet Blackquill
925c300174 Brain is in shared 2025-10-07 23:58:46 -04:00
Janet Blackquill
19f5a3e037 Merge branch 'master' into offmed-staging 2025-10-07 23:41:47 -04:00
PJBot
694fd0628f Automatic changelog update 2025-10-08 02:52:31 +00:00
SlamBamActionman
33cd3df45a Change Energy Shotgun to fit as a Warden weapon (#40757) 
* Initial commit

* Fix toggle mode name and also miscalculated charge times oops
 2025-10-08 02:40:44 +00:00
PJBot
86b1be88dd Automatic changelog update 2025-10-07 23:38:51 +00:00
Hitlinemoss
63c17b151d Added the golden shaker (playtime reward for Bartenders) (#40762) 
* Added a golden shaker (playtime reward for Bartenders)

* Removed redundant icon line
 2025-10-07 23:26:56 +00:00
PJBot
e841cb9fc6 Automatic changelog update 2025-10-07 23:15:18 +00:00
Mora
5be5e280be Added Vox Beak Types, New Markings, and Sprite Layering Fixes (#40569) 
* Added more Vox customizations

* Adds Vox Head Markings

* Update meta.json

* stray comma, woe be upon ye

* added tiny pixel to visage left and right

* Added eyeliner ftl

* Removed duplicate FTL

how the fuck did this happen

* Added cheek marking

* Made tip marking look a bit better

* Fix eyeliner ID

* ok whatever shut up build test. mean to me

* changed underbelly to have more flat transparency

* didnt like how it looked so i adjusted it

* Adjusted base eyeliner color

* Fixed inconsistency with nightling head tattoo

* Updated V tattoo

* Delete chest_v.png

* fix yml

ITS EVEN FUNNIER THE SECOND TIME

* minor sprite fix

* Update head.png

* Re added stray pixel, added square cere beak

* Added hooked beak

---------

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
 2025-10-07 23:03:21 +00:00
PJBot
0734cdd18a Automatic changelog update 2025-10-07 19:37:39 +00:00
Hitlinemoss
afe11dc959 MRE wrappers / cotton nutri-bâtards are no longer twice as nutritious as nutribricks (#40761) 2025-10-07 19:25:19 +00:00
Deserty0
d463aba587 New HTN precondition: has status effect (#39781) 
* Create HasStatusEffectPrecondition.cs

* Update HasStatusEffectPrecondition.cs

* ok now it works

* Update HasStatusEffectPrecondition.cs
 2025-10-07 18:53:25 +00:00
PJBot
1deef4bb7e Automatic changelog update 2025-10-07 18:23:15 +00:00
FungiFellow
167f3f2b92 Biosuit Suit Slots (#39888) 
* Added Gastank Storage to Biosuits, Weapon/Gas to Sec Biosuit

* Fixed Error

* Sec Suit no longer Child to General Biosuit

* Update cargo_security.yml
 2025-10-07 18:10:43 +00:00
PJBot
6dc131b76c Automatic changelog update 2025-10-07 16:34:50 +00:00
FungiFellow
4bd1cb3ac4 Cancer Mice Ghostrole Info (#40102) 
* Adjusted Cancer Mouse Ghost Info

* Updated Smite Snail

* Added ghostrole info

* Remove snail info

* Update space.yml

* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-10-07 16:20:40 +00:00
kosticia
745c6d0edc Unpredict MagnetPickupSystem.cs (#39988) 
* unpredict

* predict
 2025-10-07 16:09:20 +00:00
āda
ceedfb6d39 Standardize state names in drinks yml (#40316) 
* drinks_base

* drinks_special

* drinks_fun

* drinks_cans - the holy minus diff

* bottles_glass and metamorphic

* mugs

* Solar's Best Hot Drinks

* misc drinks_cups

* slight addition to base

* lint fix

* metamorphic glass

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-10-07 16:05:30 +00:00
dffdff2423
70543885e7 Add log statement for missing guidebook proto (#40380) 
* Add log statement for missing guidebook proto

Also removed an unused parameter.

* Update Content.Client/Guidebook/DocumentParsingManager.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-10-07 15:59:59 +00:00
PJBot
7b7f49cd39 Automatic changelog update 2025-10-07 16:06:15 +00:00
Spanky
ff01e13d24 Head of Security's Energy Magnum (and Warden's Energy Shotgun) (#40615) 
* Energy magnum and projectile protos, locker fills, and traitor objective updates.

* Fix objective

* Objective and .rsi tweaks

* Rewrite item description.

* Remove energy shotgun self charging and decrease magnum disabler cost.

* Bring magnum disabler fire cost in line with regular disabler.

* Bunch of sprite improvements including charge status visuals.

* whoops

* Minor sprite edit for clarity

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-10-07 15:53:55 +00:00
Leon Friedrich
4b51b2953d Fix post-mapinit NPC exception (#40244) 
Ensure `NPCBlackboard.Owner` is set during startup
 2025-10-07 14:03:45 +00:00
PJBot
6b480673cd Automatic changelog update 2025-10-07 14:13:33 +00:00