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

31263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
c063f98f22 Automatic changelog update 2025-04-20 11:54:49 +00:00
PJBot
3f8e3f70b0 Automatic changelog update 2025-04-20 11:53:43 +00:00
RedBookcase
05d79667bb Makes more items recyclable. (#35800) 
* Makes more items recyclable.

* Added newlines

* Fixed material issues which were NOT MY FAULT

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-04-20 13:53:37 +02:00
PJBot
6622dcafb5 Automatic changelog update 2025-04-20 11:52:37 +00:00
Pgriha
8be4abc3fc Fix head markings under some helmets (#36074) 
* 1

* 2
 2025-04-20 13:52:31 +02:00
Nox
f4e7601dc9 Descriptions for .35 auto (#36085) 
* Initial commit.

* added SMG descriptions

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

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

* Updated descriptions to incorporate Roomba's feedback.

* Slightly changed Viper description

* Minor formatting change

* Updated Atreides description

* Fixed a minor convention mistake in magazines

* Slightly changed the Viper's description to not reveal its manufacturer.

* Updated Drozd description.

* Rerun test

* Updated descriptions in accordance with Roomba's suggestions!

* Updated Viper description!

* Shit I forgot to remove the cartridge length, did it now!

* More smart changes by Roomba

* Tests gaslighting me

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

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

* Updated WT550 description

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-20 13:51:27 +02:00
Nox
9d4c97701d Fix some SMG magazines fitting 35 rounds (#34782) 
All SMG magazines are now 30 round, rather than half being 35 round.
 2025-04-20 13:33:31 +02:00
PJBot
d46c54bde0 Automatic changelog update 2025-04-20 09:33:09 +00:00
Helm
edc57cab16 Fix soup (#34633) 
Co-authored-by: Helm4142 <Helm4142@users.noreply.github.com>
 2025-04-20 11:32:02 +02:00
Spessmann
1c3bdd5ba5 Small ruin fixes (#36763) 2025-04-20 01:54:01 -07:00
PJBot
79a76e418c Automatic changelog update 2025-04-20 07:01:40 +00:00
Cass
39bf2469ad Plurality pin addition (now not on master branch) (#36744) 2025-04-20 00:00:33 -07:00
PJBot
0768f1f33f Automatic changelog update 2025-04-20 06:02:34 +00:00
ArtisticRoomba
8d8398e60d kill filing cabinet heisentests (#36757) 2025-04-20 02:01:28 -04:00
PJBot
99364dc4de Automatic changelog update 2025-04-20 05:59:48 +00:00
chromiumboy
6bebde9959 Bugfix to sync emergency broadcast cooldowns on holopad UIs (#34115) 
* Initial commit

* Bug fix

* Included check for gaining power

* Addressed reviews
 2025-04-20 15:58:41 +10:00
PJBot
d5252d9808 Automatic changelog update 2025-04-20 05:58:08 +00:00
Alzore
d7c244293c Aquatic tail and back fin markings for lizards (#33219) 
* shark tail and back fin for lizards

* credit me
 2025-04-20 15:57:01 +10:00
TytosB
394c0c5414 loop lairlock lattice fix (#36758) 
* sinful

* funeralofdeadbutterflies

* butterfly

* lattice fix
 2025-04-19 23:51:13 -06:00
TytosB
5ad02a0844 New salv ruin- butterfly funeral (#36755) 2025-04-19 22:22:04 -07:00
TytosB
739917641d Salvage ruins- the deadly sins (#36754) 2025-04-19 21:32:19 -07:00
Spessmann
1aa397bcd6 Add More Ruins (#36752) 2025-04-19 21:27:20 -07:00
Tayrtahn
31cf0505c9 Convert NameIdentifier to use NameModifierSystem (#36736) 
Convert NameIdentifier to use NameModifierSystem
 2025-04-20 14:16:59 +10:00
Kyle Tyo
2c54ec10c6 replace obsolete IsGrid calls with HasComp<MapGridComponent> (#36729) 
* replace obsolete IsGrid calls with HasComp<MapGridComponent>

* remove IMapManager dependency

* well would you look at that

* just look at it
 2025-04-20 14:14:58 +10:00
Emisse
a6d2b1f0b8 Terrarium ruin (#36739) 2025-04-19 21:03:34 -06:00
PJBot
89d0eb140e Automatic changelog update 2025-04-20 02:42:30 +00:00
ArtisticRoomba
44925b9be7 Fix spray nozzle not cleaning reagents properly (#35950) 
* init, god help us all

* further refining

* final round of bugfixes

* whoopsies

* To file scoped namespace

* first review

* oopsie

* oopsie woopsie

* pie is on my face

* persistence

* datafieldn't

* make PreviousTileRef nullable

* change component to file scoped namespace

* Minor tweaks:

- We clamp the reaction amount to a minimum value because when working with percentages and dividing, we approach numbers like 0.01 and never actually properly delete the entity (because we check for zero). This allows us to react with a minimum amount and cleans things up nicely.
- Minor clarification to comments.
- Rebalancing of the spray nozzle projectile.

* the scug lies!!!!

* undo file scoped namespace in system

* kid named warning

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-04-19 22:41:24 -04:00
shibe
a90c16b8d1 Add one word to the dragon summon announcement (#36749) 
terror!!!!
 2025-04-20 12:26:10 +10:00
Nemanja
07e21c6516 Fix artifact spawns parenting to players (#36745) 2025-04-20 11:00:49 +10:00
Nemanja
f04f19a7aa Fix ore silo clients showing up when out of range (#36741) 2025-04-20 11:00:23 +10:00
github-actions[bot]
5b3a72e9b5 Update Credits (#36748) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-04-19 20:41:15 -04:00
PJBot
642e3a6042 Automatic changelog update 2025-04-20 00:18:47 +00:00
SeamLesss
511467f94a Scarf Resprite (#35446) 
* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* all of em

* better scarfs
 2025-04-19 20:17:38 -04:00
TytosB
10ca6cb179 fixgridatmos 2025-04-19 16:19:08 -05:00
Velcroboy
a327a59cb2 Smuggler follow up (#36456) 
* Fix Overfilling satchels

* Add notes

* Clearer

* remove line :/

* Reduce by 1 cigars/booze

* fix typo

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2025-04-19 23:07:49 +02:00
TytosB
e561836a03 terrarium 2025-04-19 15:42:59 -05:00
PJBot
aed81bf82e Automatic changelog update 2025-04-19 20:35:01 +00:00
ScarKy0
20841d402f Give salvage borgs a tool module. (#33336) 
Init
 2025-04-19 16:33:54 -04:00
PJBot
74f68fa634 Automatic changelog update 2025-04-19 20:33:24 +00:00
MilenVolf
6f475741b2 [#30096 Fix] Dumping a RefillableSolution into a DumpableSolution now requires CanComplexInteract (#33350) 
* dumping containers now require having at least one hand

* Cleanup

* Better

* Apply suggested changes

* Cleanup

---------

Co-authored-by: Luiz Costa <luiz@mavromati.com>
 2025-04-19 16:32:17 -04:00
PJBot
cb5a0fbbb3 Automatic changelog update 2025-04-19 20:21:41 +00:00
c4llv07e
52323a8972 Better PowerCharge menu wrapping (retry) (#34036) 
* fixed

* Move wattage to the power button

---------

Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
 2025-04-19 16:20:32 -04:00
Emisse
83db0689d6 Plasma ore silos and department eco (#36715) 2025-04-19 12:56:46 -06:00
Emisse
c9c94bb407 Elkridge - Silo (#36716) 2025-04-19 12:56:21 -06:00
Emisse
54242c6982 Fland Silo (#36724) 2025-04-19 12:56:11 -06:00
Emisse
313e48f911 Packed Silo (#36722) 2025-04-19 12:31:39 -06:00
Emisse
e93bfff6b0 Omega Silo (#36718) 2025-04-19 12:31:28 -06:00
Emisse
492ff9dbd7 Oasis Silo (#36720) 2025-04-19 12:31:12 -06:00
Emisse
85c6ef0fef Convex Silo (#36734) 2025-04-19 12:21:39 -06:00
Emisse
a94404b06b Loop Silo (#36733) 2025-04-19 12:21:28 -06:00