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

32187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
4e5a73a447 Automatic changelog update 2025-04-12 09:06:22 +00:00
Pieter-Jan Briers
453e85a899 Lobby duration is now 5 minutes on wizden (#36476) 
The default value is 2 minutes 30 seconds, which was set many years ago. The game is different now, people need time to stretch their legs or get some water.

This was prompted by an internal discussion about unhealthy playing habits in the game.
 2025-04-12 11:05:13 +02:00
Emisse
0b48cbe5e4 Increase Bagel's secoff job slots to 6 (#36434) 2025-04-12 01:37:50 -06:00
Pieter-Jan Briers
e6e60dead4 Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-11 23:30:52 +02:00
PJBot
86620dbe6c Automatic changelog update 2025-04-11 21:05:44 +00:00
Errant
4ecdc17bb8 PlayerPanel username copy fix (#36468) 
weh
 2025-04-11 23:04:37 +02:00
Tayrtahn
f7850a3c0b Fix ninja battery drain debug assertion (#36461) 
Fix ninja battery drain using wrong uid
 2025-04-11 19:42:54 +02:00
Silicon14
054a58d199 Fixed phalanxamines guidebook entry. (#36458) 
* fixed phalanxamines guidebook entry

* Update Resources/Locale/en-US/reagents/meta/medicine.ftl

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2025-04-11 19:02:53 +02:00
metalgearsloth
6b96fb45a6 Update submodule to 252.0.0 (#36462) 2025-04-12 02:10:54 +10:00
Milon
3a6441932e Directional BoundUserInterfaceMessageAttempt content edition (#36320) 2025-04-12 01:33:32 +10:00
TakoDragon
dc37ab7c6d RD Windoor (#36377) 
rd-windoor
 2025-04-11 15:13:17 +02:00
lunarcomets
fd7413f51a predict borg selection (#36430) 
do the thing
 2025-04-11 14:17:11 +02:00
Damn Feds
edb5dd0b30 fixes removed annotations 2025-04-11 22:43:11 +12:00
Damn Feds
d66c59d38d Merge branch 'master' into bagel-sec-count 2025-04-11 22:41:46 +12:00
Nemanja
1540880eb2 Predict Labels (#36406) 
* Predict Labels

* nitpicks
 2025-04-10 22:19:48 -07:00
PJBot
b812045d64 Automatic changelog update 2025-04-11 04:59:40 +00:00
Nox
680544a53a Descriptions for .45 magnum (#36383) 
* Initial commit: added descriptions to revolvers, N1984, speedloaders, cartridges, and ammo boxes.

* Updated descriptions in accordance with Slarti and Roomba's suggestions.

* Oops, did a misclick!

* Updated Mateba description slightly

* Slightly updated pirate revolver description

* Updated Mateba description

* Updated Mateba description again

* Fixed a last occurence of restricted in AP bullets
 2025-04-10 21:58:33 -07:00
PJBot
3a27de3f7e Automatic changelog update 2025-04-11 02:16:33 +00:00
Nox
4006914e35 Descriptions for .25 caseless (#36385) 
* Initial commit: added descriptions to ammo boxes, cartridges, and magazines, and modified the cobra pistol's description.

* Updated magazine descriptions slightly

* Updated descriptions according to Roomba's feedback

* Minor updates

* Minor fixes

* Minor touch-up

* I should stop making tiny changes.

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-11 04:15:26 +02:00
PJBot
6d2f5a6844 Automatic changelog update 2025-04-11 02:11:10 +00:00
Dinner
3f0ca9b786 Fix gas mixers and pneumatic valves being hidden by floor tiles (#36428) 
fix gas mixers and pneumatics valves being hidden by floor tiles
 2025-04-11 04:10:03 +02:00
PJBot
b2c05b807d Automatic changelog update 2025-04-11 02:07:53 +00:00
YoungThug
97e8c4d506 Wizard added in all at once! (#36408) 
SpeedMergePlease
 2025-04-10 19:06:47 -07:00
Tobias Berger
812d47bb2d Choose correct state when rendering entities (#36409) 2025-04-11 03:56:02 +02:00
lzk
262e7ae904 fix cargo products (#36447) 2025-04-11 03:15:20 +02:00
PJBot
1100807944 Automatic changelog update 2025-04-11 01:13:20 +00:00
Ethan_k
0977b74294 Zombies can no longer Suicide take 2 (#36453) 
* I did it right

* Update Content.Server/Zombies/ZombieSystem.Transform.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-04-11 03:12:13 +02:00
PJBot
55bc0058f4 Automatic changelog update 2025-04-11 00:58:48 +00:00
RedBookcase
05785e7d45 Made the mosin major contraband, fixed uplink name. (#36446) 
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-04-11 02:57:41 +02:00
PJBot
be6753a9c3 Automatic changelog update 2025-04-11 00:55:32 +00:00
Nemanja
2769de7b5d Add Aluminum Source (Cans) (#36449) 
* aluminium cans

* shhhhh
 2025-04-11 02:54:24 +02:00
Tiniest Shark
d50703d7a4 Hypospray Inhand Fix (#36452) 
* fixed the cmo hypospray inhands

* whoops it was the gorlex one too
 2025-04-11 02:53:31 +02:00
PJBot
3c5877edb6 Automatic changelog update 2025-04-10 22:23:24 +00:00
SlamBamActionman
5975853447 Decrease Syndicate raid suit size, add bundle backpack (#35890) 
Decreased Syndicate raid suit size, add bundle backpack
 2025-04-10 15:22:17 -07:00
Myra
a96fd7e08f New "PR made on master" message (#36441) 
* New "PR made on master" message

* Update close-master-pr.yml

* Sponsored by languagetool

* Update close-master-pr.yml

* Update close-master-pr.yml
 2025-04-10 13:10:26 -07:00
Silicon14
ddaa62c685 Change ambuzol plus guidebook entry to match recipe. (#36444) 
change ambuzol plus guidebook entry to match recipe
 2025-04-10 22:04:10 +02:00
Kirby
ee90926ccd Changes the name of the Detectives suitskirts from "... suit" to "... suitskirt" (#36436) 
* Changes the name of the detectives skirts

* Whoops. Didn't mean to delete that
 2025-04-10 12:34:48 -07:00
Emisse
418b931ab8 Job count annotation for each map yml file (#36433) 2025-04-10 11:43:52 -06:00
PJBot
32e6203a9d Automatic changelog update 2025-04-10 16:00:25 +00:00
SlamBamActionman
7f6756135b Add cooked dragon steak and cutlets (#36273) 
* Add cooked dragon steak and cutlets

* If it's worse for you it's even more of a delicacy

* Attribution
 2025-04-10 08:59:18 -07:00
PJBot
08679be702 Automatic changelog update 2025-04-10 14:19:42 +00:00
chromiumboy
00ab7775d0 Holopad fixtures bugfix (#36341) 
Initial commit
 2025-04-10 16:18:36 +02:00
PJBot
4862f072c2 Automatic changelog update 2025-04-10 13:56:20 +00:00
ArtisticRoomba
c6581e655c Fix power cells/cages counting for laser weapon bounties (#36431) 
fix cargo bounty bug
 2025-04-10 15:55:13 +02:00
metalgearsloth
4b5b7a19a1 Update submodule to 251.0.0 (#36435) 2025-04-10 21:49:14 +10:00
Pieter-Jan Briers
25b620de23 Lower minimum size of absorbent item status (#35804) 
80f2dc6dd3 fixed BoxContainer so that the actual specified MinimumSize gets used. This is a problem because for the absorbent item status it's way too high so it looks silly.
 2025-04-10 20:48:13 +10:00
J
3c307f3b36 Various UI warnings cleanup (#36169) 
* Various UI warnings cleanup

* Revert unnecessary change

* Redoing SpriteSystem as it's non-injectable

* Missed one

* Better entity instantiation

* General cleanup of warnings changes

* Wrong class name!
 2025-04-10 20:47:05 +10:00
PJBot
48004bfad7 Automatic changelog update 2025-04-10 10:45:17 +00:00
slarticodefast
f6bfce38da remove mind roles from EntityWhitelist (#36089) 
* remove mind roles from EntityWhitelist

* remove redundant dependency
 2025-04-10 20:45:12 +10:00
RedBookcase
dc6ed30ec8 Fixed the empty mass scanner still being a normal item, whoops. (#36340) 
* Fixed the empty mass scanner still being a normal item, whoops.

* Fixed parenting duplication and issues with item state.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-04-10 20:44:06 +10:00