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

16048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
528a03005f Automatic changelog update 2023-04-10 22:20:50 -04:00
deltanedas
27bdc5d4b5 prevent nettles from injecting through hardsuit (#14895) 
* prevent nettles from injecting through hardsuit

* pro

* better

* pro

* pro

* noob

* inject popup

* caution

* )

* ;

* 💀

* 💀

* scaf + bomb suit immune to nettle

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-10 19:19:43 -07:00
PJBot
5d66215513 Automatic changelog update 2023-04-10 21:57:26 -04:00
Kara
4538a0b23e Fix minor puddle regressions (#15295) 2023-04-10 20:56:21 -05:00
PJBot
a225ee9632 Automatic changelog update 2023-04-10 21:24:39 -04:00
freeman2651
96e91f5dc2 [tweak] Pills 1984 (#15292) 
* reduce pill volume to 20u

* and fix chem master dosage lmao
 2023-04-10 19:23:35 -06:00
PJBot
9fd443aec2 Automatic changelog update 2023-04-10 20:32:20 -04:00
crazybrain23
b7c6e4cc47 Chameleon breath mask fix (#15024) 2023-04-10 17:31:14 -07:00
Emisse
2fa3d9f4af [Map] Omega Updatey (#15290) 2023-04-10 16:51:23 -06:00
PJBot
d78041a0f5 Automatic changelog update 2023-04-10 18:36:47 -04:00
deltanedas
7c8f4054f3 artifacts no longer rigged (#15283) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-10 15:35:42 -07:00
Emisse
fe01cfc01b [Map] Meta Update (#15291) 2023-04-10 16:07:38 -06:00
Emisse
34c39a08d3 [Map] Fland Update 1.5 (#15288) 2023-04-10 15:46:12 -06:00
Emisse
cf2194f89e [Map] Marathon Updatey (#15289) 2023-04-10 15:34:09 -06:00
PJBot
ebf41c947d Automatic changelog update 2023-04-10 17:31:37 -04:00
Nemanja
2d78c50f3e fix material reclaimer sound issue (#15278) 
* fix material reclaimer sound issue

* this, too
 2023-04-10 16:30:33 -05:00
PJBot
8ea9957736 Automatic changelog update 2023-04-10 17:30:21 -04:00
Puro
6341e7d094 [Tweak] Robust Nukie in Sustenance Vendor (#15274) 2023-04-10 15:29:15 -06:00
Kara
4ceb45d171 [Combat] Let people melee attack themselves (#15272) 2023-04-10 15:28:27 -06:00
Emisse
f796933b9e [Map] Box Updatey (#15286) 2023-04-10 15:08:31 -06:00
Emisse
de2143625c [Map] Bagel Spider and Recycler (#15263) 2023-04-10 14:17:10 -06:00
brainfood1183
c27fc01b29 [map] Origin-added shiva and reclaimer (#15270) 2023-04-10 14:01:06 -06:00
metalgearsloth
360f16fee5 Fix edgespreaderprototype linter (#15265) 2023-04-10 17:54:50 +10:00
PJBot
9cbd7a5e85 Automatic changelog update 2023-04-10 02:44:29 -04:00
metalgearsloth
a17bb60321 Fix spreader logic (#15260) 2023-04-10 16:43:25 +10:00
metalgearsloth
aebe31cfde Fix master (#15256) 2023-04-10 15:47:51 +10:00
brainfood1183
8e817e2b97 pirate content (#11799) 
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2023-04-09 22:47:40 -07:00
metalgearsloth
317a4013eb Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
PJBot
3178ab83f6 Automatic changelog update 2023-04-10 00:39:24 -04:00
Nemanja
57f2a768a0 Material Reclaimer (#14969) 
* Material Reclaimer

* Fix this test

* autostack output, tweak volume, add upgrade examine

* whitelist AND blacklist support

why not

* trying so hard to get this fucking test to work

* EmoGarbage delves into MaterialArbitrageTest, never to return

* VV and restore cloth to glory

* make the system more robust

* even more stuff has composition; add blacklist for important items

* fix test fails

* convert recycling

* forgor :sadge:

* lol

* simply a modiCUM of doc commentary
 2023-04-09 23:38:20 -05:00
PJBot
69c1317d1c Automatic changelog update 2023-04-10 00:34:27 -04:00
Nim
b9e71237c4 Predatory pet for HoS (#15237) 2023-04-09 21:33:22 -07:00
DrSmugleaf
39f272fa5c Remove PA component references (#15252) 2023-04-10 14:10:33 +10:00
TurboTrackerss14
f8cef464a2 Added small text to Guidebook Security tab. (#15248) 
This file has existed for a good while with zero content as is the only dropdown in the guidebook without text.
Why not for a first commit eh?
 2023-04-09 18:06:27 -05:00
DrSmugleaf
66adf34f59 Remove cryo pod component references (#15247) 2023-04-09 15:28:19 -07:00
DrSmugleaf
ec28358e06 Remove mech component references (#15246) 2023-04-09 15:20:55 -07:00
PJBot
856d1a5086 Automatic changelog update 2023-04-09 18:07:34 -04:00
lzk228
e76f7d7750 [Cargo] Added MK58 crate (#15204) 
* Added crate with MK58 to request console

* fix price

* fix
 2023-04-09 16:06:30 -06:00
PJBot
9718cc749c Automatic changelog update 2023-04-09 18:01:26 -04:00
potato1234_x
5a4e93fabd [Entity] Sustenance Vendor (#15119) 
* sustenance vendor

* emaggedinventory
 2023-04-09 16:00:23 -06:00
PJBot
0a94ccea9b Automatic changelog update 2023-04-09 17:59:25 -04:00
Puro
6926a76977 [Fix] Chemical bottles (#15198) 
* [Fix] Chemical bottles

* Min 0
 2023-04-09 15:58:22 -06:00
Puro
aeefc43ba9 [Spawn] Motobike Spawner (#15238) 2023-04-09 15:57:40 -06:00
crazybrain23
8d5ed9f629 Fix path to boxes.rsi (#15242) 2023-04-09 15:53:03 -06:00
PJBot
dfc623327f Automatic changelog update 2023-04-09 17:51:33 -04:00
Puro
7448c2d750 [Spawner] Pirates icon (#15241) 2023-04-09 15:50:28 -06:00
PJBot
7c181cf102 Automatic changelog update 2023-04-09 17:45:28 -04:00
Nemanja
e2f4b4eaff Make broken cuffs trash, fix color for broken makeshift cuffs (#15203) 2023-04-09 15:44:24 -06:00
PJBot
2a2883f206 Automatic changelog update 2023-04-09 17:43:21 -04:00
Puro
2c8d148bca [Sprites] Adds in hand sprites (#15244) 2023-04-09 15:42:17 -06:00