tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,364 Commits 3 Branches 5 Tags
436e8407dc0d61716734f0c95b51f7f1a5ff2624
Commit Graph

4202 Commits

Author SHA1 Message Date
crazybrain23
436e8407dc Fix, ice cream tastes like ice cream (#15389) 2023-04-13 12:51:11 -07:00
Puro
a35e2a8bba [Speech] Moth speech bubble (#15356) 2023-04-13 00:21:57 -07:00
metalgearsloth
be4e69b0c0 Station maps (#13027) 2023-04-13 16:21:24 +10:00
Checkraze
fc94d5245e [Map] kettle 1.7 (#15357) 2023-04-12 19:25:09 -06:00
crazybrain23
d5bacb2006 [Tweak] venders have robot typing indicator (#15355) 2023-04-12 14:15:28 -06:00
crazybrain23
52e8e97924 [Fix] Prevent Shiva suicide (#15354) 
* Prevent Shiva suicide

* fix indent oopsie
 2023-04-12 13:55:59 -06:00
deltanedas
2b14e9a99b [Tweak] Syndi pens are bought in boxes now (#15190) 
* pens are bought in wrappers now

* pro

* maybe

* pro

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-04-12 12:44:52 -06:00
Puro
37f4cfe8b2 [Fix] Security cadet spawner icon (#15324) 
* [Fix] Security cadet spawner icon

* fix meta

* mergefix
 2023-04-12 12:33:19 -06:00
Puro
8a3cb9422e [Spawner] Boxer now spawns (#15351) 2023-04-12 12:32:49 -06:00
mhamster
53b0996df2 [Tweak] Change sleep icon to syndie pyjama's hat (#15353) 
Change sleep and wake actions icons to syndie pyjama's hat (which is more logical than just an egg)
 2023-04-12 12:26:06 -06:00
DrSmugleaf
9146374e39 Remove ghost role component references (#15262) 2023-04-12 23:32:14 +10:00
Emisse
805cb49b39 [Map] Fland Brigmed (#15345) 
* fland

* proto
 2023-04-12 02:54:38 -06:00
Emisse
76881d9c4e [Map] Meta Brigmed (#15344) 
* meta

* proto
 2023-04-12 02:54:26 -06:00
Emisse
e9cf2f026c [Map] Box Brigmed Update (#15343) 
* Box Brigmedic

* brigo
 2023-04-12 02:54:05 -06:00
Whisper
3f787fcd75 Cloth can be used as gauze to stop bleeding (#15311) 2023-04-12 02:53:10 -06:00
brainfood1183
318cbc4146 Craftable Clown Hardsuit (#15317) 
* clownhardsuit

* clothing construction catagory
 2023-04-12 02:52:08 -06:00
Myakot
ae1675bc7f [BUG] fixing lizard's stomach sizes (#15341) 
My first ever PR and it's a webeddit, yay. Can't see this going wrong or just straight out denied.
fixed #15108 = lizards having twice the stomach volumes they should
 2023-04-12 02:51:31 -06:00
brainfood1183
8a8ea834d7 [Map] Origin added brigmedic (#15331) 2023-04-11 19:32:37 -06:00
DrSmugleaf
98b4af8df0 Remove inventory component references (#15249) 2023-04-12 10:20:47 +10:00
Puro
d068c4f36b [IDK] Cleaning the code from useless variables (#15323) 2023-04-11 17:15:39 -07:00
Emisse
66500ba23c [Map] Bagel Brig Med Update (#15329) 
* brigmed

* brigmed bongel
 2023-04-11 18:13:30 -06:00
Puro
682c6e02cc [Job] Brigmedic (#15319) 
* [Job] Brigmedic

Everything is included!

* id meta fix

* fix brigmed.yml

* brigmed hardsuit migration
 2023-04-11 17:11:01 -06:00
EnDecc
34f5cb7440 Drain buffs (#15300) 2023-04-11 21:21:30 +10:00
Kara
3bb2b27169 Delete more body code (#15259) 2023-04-10 23:28:10 -07: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
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
crazybrain23
b7c6e4cc47 Chameleon breath mask fix (#15024) 2023-04-10 17:31:14 -07:00
Nemanja
2d78c50f3e fix material reclaimer sound issue (#15278) 
* fix material reclaimer sound issue

* this, too
 2023-04-10 16:30:33 -05:00
Puro
6341e7d094 [Tweak] Robust Nukie in Sustenance Vendor (#15274) 2023-04-10 15:29:15 -06: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
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
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
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
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
potato1234_x
5a4e93fabd [Entity] Sustenance Vendor (#15119) 
* sustenance vendor

* emaggedinventory
 2023-04-09 16:00:23 -06: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
Puro
7448c2d750 [Spawner] Pirates icon (#15241) 2023-04-09 15:50:28 -06:00
Nemanja
e2f4b4eaff Make broken cuffs trash, fix color for broken makeshift cuffs (#15203) 2023-04-09 15:44:24 -06:00
Interrobang01
7c0aec62ec Diona CO2 Respiration (#15112) 2023-04-08 19:35:07 -07:00
liltenhead
35c7ae41bb Adds slight protection to HoS common clothes (#15213) 2023-04-08 19:32:22 -07:00
Menshin
409af4f481 Fixes air sensors not accessing gas mixture on construction + visual fixes (#15224) 2023-04-08 19:25:38 -07:00
lzk228
7be21a62ec Added clown satchel (#15225) 2023-04-08 19:24:44 -07:00
DrSmugleaf
34bcd042d1 Remove combat mode component reference (#15206) 2023-04-08 13:16:48 -07:00
Morb
3c06b87572 Use chat emotes for disease (#15134) 
* Use chat emote system for disease

* Use chat emotes in prototypes

* Fix sound path

* Fix prototype ids

* Update Content.Server/Disease/DiseaseSystem.cs

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>

---------

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
 2023-04-07 16:17:30 -07:00
liltenhead
a8586312da Add sharp to shards and broken bottles (#15195) 2023-04-07 14:10:54 -06:00