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

30252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
6fe531dcd1 Automatic changelog update 2025-02-13 08:01:45 +00:00
Smith
3c8fb2e865 Grilled Cheese Sandwich Entity and Recipe (#33807) 
* Grilled Cheese Prototype

* Typos

* Removed butter reagent to test flavour changes.

* Flavour corrections.

* CC-BY-SA-3.0 attribution

* Fixing meta.json

* I lost an hour of my life to a missing comma in meta.json

* Merge Conflict Rebase and Test Fixing

* Cook time to 10 seconds.

* Sandwich nutritional balance

* Grilled cheese sprite fixed, found the actual original source for copyright.
 2025-02-13 00:00:38 -08:00
PJBot
d44d48ef96 Automatic changelog update 2025-02-13 07:56:11 +00:00
Minemoder5000
8f96c77de5 Slime plushie now squishes (#33554) 
* Slime plushie now squishes

* Remove useSound
 2025-02-13 08:55:04 +01:00
Milon
f6a1fd5de8 add missing base calls to several BUIs (#35124) 2025-02-13 01:41:30 -05:00
PJBot
25de99ec99 Automatic changelog update 2025-02-13 05:52:37 +00:00
Saphire Lattice
382cd710a7 Use screen local north for buckling/unbuckling layering, plus #31625 (#33447) 
* Fix sprite layering upon strapping/unstrapping

* switch from strap to buckle events

* Use screen-local North for the checks instead

Build on top of PR #31625, but I'm not wanting to just push to someone's older PR without a warning.

---------

Co-authored-by: themias <themias5@gmail.com>
 2025-02-12 21:51:28 -08:00
ActiveMammmoth
9fad86342f Wizard Staff of Animation (#34649) 2025-02-12 23:46:02 -05:00
PJBot
0bb6f1979d Automatic changelog update 2025-02-12 18:43:05 +00:00
Ghagliiarghii
859918f1bd light brown fibers (#35111) 2025-02-12 13:41:57 -05:00
Ed
47cb8a0b08 RoomSpawner mask (#33110) 
* RoolFill can now spaw rooms with any size

* tile ignoring

* upgrade interior

* simplify

* Update DungeonSystem.Rooms.cs

* center rooms

* Update RoomFillComponent.cs

* Update RoomFillComponent.cs

* Update DungeonSystem.Rooms.cs

* Remove roomfillcoponent from integration test

* Update EntityTest.cs

* remove nullable size, replaced with minsize and maxsize

* clear existing logic refactor

* delete this one
 2025-02-12 15:47:48 +03:00
Winkarst
0d33e6182c Split `ReplacementAccentPrototype and ReplacementAccentComponent` in different files (#35107) 
* Split ReplacementAccentPrototype  and ReplacementAccentComponent

* Fixes

* Fixes

* inheritdoc
 2025-02-12 12:21:12 +01:00
Partmedia
773159d6db Add datafield comments to PlantHolderComponent (#35099) 2025-02-12 10:59:40 +01:00
PJBot
107f4729ee Automatic changelog update 2025-02-12 08:59:14 +00:00
Milon
0d7ff79d23 update the announce command (#34889) 2025-02-12 19:58:05 +11:00
ArtisticRoomba
75727db3a3 Add new freezer atmos devices and fix freezer fixgridatmos marker (#34991) 2025-02-12 18:32:18 +11:00
metalgearsloth
5c98da40cd Update submodule to 244.0.0 (#35094) 2025-02-12 13:48:12 +11:00
PJBot
c5884983d8 Automatic changelog update 2025-02-12 00:44:16 +00:00
Nox
129bcdfeb7 Deathsquad revolver ammo fix (#34910) 
* Added AP version of mateba, and put it in the deathsquad starting equipment.

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

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

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-11 16:43:10 -08:00
Winkarst
5b394c2f5a Fix energy katana resolve error (#35082) 2025-02-11 16:37:39 -08:00
PJBot
4dfe1c1b29 Automatic changelog update 2025-02-12 00:30:20 +00:00
beck-thompson
daad17c97d Add fultons as a T2 research (#34567) 
* commit

* fixed
 2025-02-11 16:29:13 -08:00
PJBot
4e39481555 Automatic changelog update 2025-02-11 23:14:09 +00:00
Tayrtahn
4603b47778 Limit maximum capacity of fillable cluster grenades (#34281) 
* Limit maximum capacity of fillable cluster grenades

* Swap GrenadeCount method for component property
 2025-02-12 00:13:00 +01:00
robinthedragon
a849d2c989 ancient jumpsuit copyright info (#35061) 
* update meta.json with copyright info

* unblob

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

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-02-11 15:06:53 -08:00
Spessmann
bf20b6bb6e Convex update (#35086) 
convex update #5
 2025-02-11 14:44:18 -07:00
PJBot
072d2f4834 Automatic changelog update 2025-02-11 21:35:31 +00:00
Tayrtahn
46b19291ea Fix followers getting sent to nullspace when target is polymorphed (#33878) 
* Add an event for polymorph actions

* Subscribe FollowerSystem to the event

* Add check that unfollow target is actually current target.

* Make followers try to follow on state update; Dirty follower on follow.
 2025-02-11 22:34:24 +01:00
PJBot
fa020ceef3 Automatic changelog update 2025-02-11 19:06:41 +00:00
Terraspark4941
2c728dcca9 Make Advanced Spray more tolerable to use (#34209) 
* initial commit

* Fixed the eject order

* FINALLY got a new sprite, its ready to merge!

* I FORGOT THE ATTRIBUTIONS DAMMIT

* Remove extra whitespace

* Sprite update!
 2025-02-11 11:05:34 -08:00
justdie12
78c951c790 Fixed trooper uniform sprite (#35065) 2025-02-11 10:04:42 -08:00
PJBot
5c598ae90f Automatic changelog update 2025-02-11 17:49:33 +00:00
Theodore Lukin
7b38a99d23 give CE atmos gas mask (#35063) 2025-02-11 09:48:27 -08:00
Winkarst
0b2d70088c Update BuildChecker.csproj (#35072) 2025-02-11 18:32:05 +01:00
metalgearsloth
15b28936df Add loadout names (#31303) 
* Add loadout names

Did it for AI, breaking change for pgsql + migrations in general. Nothing atm uses it.

* the box

* Spawning cherry pick

* Fix nit

* revert

* Final cleanup

* Real

* Name UI fix

* Migrations

* a

* Review

* Re-run migrations

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2025-02-11 18:30:24 +01:00
PJBot
c197d3db37 Automatic changelog update 2025-02-11 16:16:21 +00:00
Theodore Lukin
527f4ae6f2 make interrogator lamp security contraband (#35064) 2025-02-11 11:15:13 -05:00
Killerqu00
a62ffdc740 Move contraband text to a separate examine tab (#32250) 2025-02-12 01:06:22 +11:00
PJBot
c699bd9cd8 Automatic changelog update 2025-02-11 12:18:40 +00:00
T
0feeaba0bd Increase the price of bulletproof armor. (#34541) 
Update cargo_security.yml
 2025-02-11 13:17:33 +01:00
War Pigeon
9db50c9ee2 Add additional holiday gear to jobs (#34207) 
* Jobs react to more holidays

* Replace taser with Weh auto-injector

* Give cargo techs a box on box(ing) day
 2025-02-11 12:47:19 +01:00
qwerltaz
b0cacc7f14 fix conveyor belt default linking (#32688) 2025-02-11 11:44:11 +01:00
TemporalOroboros
dc67a5a0ba Purges uses of TransformComponent.WorldMatrix and TransformComponent.InvWorldMatrix (#34944) 2025-02-11 21:06:43 +11:00
deltanedas
5eceaf3e33 Remove batong etc from emagged autolathe (#35014) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2025-02-11 21:01:59 +11:00
SpaceManiac
4122310735 Fix 38 non-obsolete warnings (#33794) 2025-02-11 20:59:50 +11:00
PJBot
dbcd86a983 Automatic changelog update 2025-02-11 09:37:52 +00:00
Theodore Lukin
8d51a1fc15 buff python (#33306) 2025-02-11 20:36:45 +11:00
PJBot
e023c78c34 Automatic changelog update 2025-02-11 06:36:13 +00:00
Nox
16149f17a7 Put screwdrivers in the vendomat (#35059) 
Increased vendomat Wirecutter stock from 1 to 2. Increased vendomat Screwdriver stock from 0 to 2.
 2025-02-11 07:35:05 +01:00
chromiumboy
a2ac503201 Sentry turrets - Part 1: Art assets (#35025) 
* Initial commit

* Updated sprites

* Updated base.png and base_shadow.png

* Updated meta file
 2025-02-11 00:25:30 -06:00