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

9860 Commits

Author SHA1 Message Date
slarticodefast
ae8fdbfa51 Fix puncturase cauterizing bleeding (#38289) 
fix puncturase cauterizing bleeding
 2025-06-13 12:11:15 -04:00
SyaoranFox
72b57392d1 Rat King changed to Antag (#38124) 
* Changed rat king to be antag
Rat King guide updated to show antag rules

Initial infected given zombie faction
Zombies given zombie faction too (not sure if redundant or not)

* Given zombie faction to Initial Infected and Zombies in mind_roles

* Changed MindRoleGhostRoleAntag to MindRoleGhostRoleSoloAntagonist

removed components from antag listings

* Removed changes for zombies

* Update Resources/Prototypes/Roles/Antags/zombie.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Update Resources/Prototypes/ai_factions.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Changed mob prototype to match

* Forgot solo again

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
 2025-06-13 17:52:19 +02:00
M1tht1c
da76cc02c7 Fix visitor mindshields (#36537) 
* Make visitor mindshields removable, and give disaster victims mindshields.

* Fix whitespace

* Fix ALL the whitespace
 2025-06-13 16:43:41 +02:00
Nikovnik
685e7028d2 Transparent tear gas (#36440) 
* tweaked tear gas

* changed color of tear gas

* sped up metabolism rate of tear gas

* sped up tear gas passing more

* reduced tear gas content in grenades

* added threshold for better effect end timing

* removed clickable component from foams

* Suggestion changes

* Hide in spawn menu

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-06-13 09:53:44 -04:00
hoshizora
0b161cba6b Fix crafting steps with modular machine parts (#38299) 
fixed lines that were messing with construction menu entries for machine parts
 2025-06-12 22:21:57 -07:00
Perry Fraser
82f598a087 Use correct on-head rainbow lizard plushie sprite (#38286) 2025-06-12 14:24:19 -07:00
themias
19271e6bc9 Fix gas analyzer and anom scanner wrong state (#38285) 
* Fix gas analyzer and anomaly scanner UI activation issue

* save

* fix comment

* milkalyzer
 2025-06-12 14:16:07 -07:00
kosticia
e55985e575 Make BODAs start with Russian accent. (#38275) 
long hand of Kremlin
 2025-06-12 09:19:08 -07:00
SlamBamActionman
9a5bd9de6a Add propeller hat & swirl lollipop (#38260) 2025-06-11 18:22:51 -07:00
RedBookcase
a8801e4abf Removed Toys.rsi, reorganize toy RSIs, broad /Fun/ cleanup. (#37189) 
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-06-11 16:29:27 -07:00
Vortebo
d9f5480397 Minor Relic improvements (#38269) 2025-06-11 15:25:38 -07:00
Boaz1111
55540c374a scar availability for more species (#35645) 
* :D

* updated for new scars

* small eye scar
 2025-06-11 23:56:57 +02:00
āda
f5a28a5ad5 Cleanup exosuit fab recipes, add modules category (#38069) 2025-06-11 14:12:09 -07:00
Nox
edd2e80a4e Launchers require wielding (#38110) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-06-11 13:28:00 -07:00
Princess Cheeseballs
6052b1cfba Basilisk Nerfs for Gameplay (#38089) 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-06-11 13:20:48 -07:00
Seam_Less
f046d8a1f6 Magazine rsi Cleanup + Magazine Type Recolor (#37709) 2025-06-11 13:03:14 -07:00
Perry Fraser
36c048ba65 Add disambiguation to most construction menu recipe names (#38197) 2025-06-11 12:52:22 -07:00
ScarKy0
b7c1849e11 Fix reinforced plasma window blocking laser shots (#38041) 
* init

* stuff
 2025-06-11 08:36:20 -07:00
Boaz1111
f1e161acab Makes the grenadine bottle start closed. (#38219) 
* whywhywhy

* removes unneeded line
 2025-06-11 16:01:42 +02:00
hoshizora
905c298ed7 Fix mops, rags, and towels interacting with drains (#38252) 
added the stuff
 2025-06-10 21:54:50 -07:00
Tayrtahn
3dbb8905b5 Add test that entity prototypes don't use LocIds for name/description (#38234) 
* Add test that entity prototypes don't use LocIds for name/description

* Fix violation
 2025-06-11 02:47:04 +02:00
themias
509d650253 Fix missing bike horn implant cooldown (#38237) 2025-06-10 14:40:46 -07:00
BramvanZijp
8c6b288853 Add stamina damage resists to the bloodred raid/hard-suits (and ERT hardsuits). [TEST MERGE] (#37040) 
Add stamina damage resists to the bloodred suits.
 2025-06-10 12:31:44 -07:00
lzk
6f852b6a49 cleanup mirror.yml (#38222) 2025-06-10 17:29:09 +02:00
lzk
3a4b7d62c7 WHYYYYYYY (cleanup) (#38220) 
* WHYYYYYYYY

* Delete Resources/Locale/en-US/actions/actions/rootable.ftl
 2025-06-10 15:36:58 +02:00
slarticodefast
0bdaf9e5ff merge stable into master (#38213) 2025-06-10 12:44:53 +02:00
slarticodefast
cad0b6b3fa HOTFIX: Stop AI turrets from causing flickering lights (#38212) 
no power draw
 2025-06-10 12:39:24 +02:00
nabegator
2d5ee82aa3 hi-viz vest laser reflect (#38180) 
* Update vests.yml

* Update vests.yml

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-06-09 16:03:56 -07:00
slarticodefast
6abd44500f Stable master merge yippe among us print (#38192) 2025-06-10 00:38:10 +02:00
ArtisticRoomba
df6be08506 Derotate and remove several maps, remove unused maps (#38190) 2025-06-09 15:37:33 -07:00
cnv41
8f48eae3aa Typo fix in coffin description (#38193) 2025-06-09 15:33:23 -07:00
Disp-Dev
c3956eff6d New Recipes: Breakfasts (#37279) 
* Adds full english and american breakfasts and respective recipes

* sprite tweak and added random spawner

* reagent rebalance

* reagent re-rebalance

* spawner ID fix

* ACTUALLY actually fixed the spawner, also description changes

* reagent re-re-rebalance

* spawner fix so the linter stops screaming at me

* different check failed kekw

* trailing whitespace fix attempt #1

* identation fix? i think?

* indetation fix part 2, also vox cant eat this anymore

* more yaml fixes

---------

Co-authored-by: DispenserDev <mariousjoaquin@gmail.com>
 2025-06-10 00:33:02 +02:00
slarticodefast
d4c4606cf4 Revert tile aligned barsigns (#38185) 
fixtures for bar signs (#37756)"
 2025-06-10 00:02:31 +02:00
Tayrtahn
f8e89749c5 Give unique names to all curtain construction recipes (#38182) 
* Give unique names to all curtain construction recipes

* Duplicate entry
 2025-06-09 19:55:44 +02:00
Errant
99b2955c09 HOTFIX Revert #38004 : Change C-4 back to syndicate contraband (#38177) 
* Revert "Made C-4 Major contraband instead of syndicate contraband (#38004)"

This reverts commit 0a565469c7.

* remove changelog
 2025-06-09 18:59:37 +02:00
pathetic meowmeow
3d40bebbef Allow cargo request computers to send orders to the primary account (#37943) 2025-06-09 11:11:19 -04:00
Tiniest Shark
2d08f79229 Assorted device and core inhands (#38162) 
* Assorted device and core inhands

* whoops forgot the thief objective

* i missed literally on pixel on the fulton argh

* inhand pinpointer update
 2025-06-09 00:40:14 -07:00
Orsoniks
ef42c36cdb Improved Health examination text (#38126) 
* more health examinations

* better blood

* fix

* tweaks

* sizeable

* silicon fix

* tweaks

* bleeding color tweaks

* fix
 2025-06-09 00:31:49 -07:00
Archee
a46861e221 Missing contraband tags on explosives (#37521) 
* Firebombs as minor contraband

* Pipebombs as minor contraband

* Seismic charge as cargo/sec contra (like crushers)

* Modular payloads
 2025-06-08 18:05:22 -07:00
Nox
35411b5090 No raffle for space carp (#38101) 
No raffle for carp

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
 2025-06-07 22:49:44 -04:00
Perry Fraser
7ce2d241dd fix: allow ejecting diamonds from lathes/silos (#38132) 2025-06-07 13:36:58 -04:00
K-Dynamic
eb208a2ae8 Genpop wall lockers (#38102) 
* sprites

* genpop wall lockers

* number 5 alive

* slight boilerplate code, thank you slarti
 2025-06-07 17:51:38 +02:00
K-Dynamic
a84d718a09 Reduce disabler capacity to 16 shots (#36019) 
* 14 shots

* 14 to 16
 2025-06-07 15:05:25 +02:00
lzk
32301a6dcb chem.yml cleanup (#38129) 
Update chem.yml
 2025-06-07 13:38:36 +02:00
hoshizora
373ab740bb Add name to chameleon controller implanter (#38117) 
Update implanters.yml
 2025-06-06 19:29:13 -07:00
Spanky
668a0f0863 Light Up Landmines (#38092) 
* Adjust landmines to have unshaded lights.

* Someday I will give myself credit for the work I do.

* Adjust animation speed.
 2025-06-06 19:01:14 -04:00
jkwookee
57567a92c6 Reduce Liquid Frezon Duration (#38100) 
testing
 2025-06-06 18:41:21 -04:00
themias
afa62b5e69 Increase throwing into disposal chance (#38116) 2025-06-07 00:13:20 +02:00
Tayrtahn
136208dbc3 Fix throwing items into disposal units (#38106) 2025-06-06 23:40:08 +02:00
Minemoder5000
cddc9926b0 Shark toys use the bite animation. (#38113) 2025-06-06 14:07:09 -07:00