Commit Graph

4181 Commits

Author SHA1 Message Date
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
DrSmugleaf
97a8b64c1d Remove disposal tubes component references and ECS some of it (#15188) 2023-04-06 20:20:50 -07:00
lapatison
cc5c590ece Adds the clown recorder (Clown fix) (#15074) 2023-04-06 20:06:52 -06:00
ShadowCommander
1c55904cd2 Add Alt-click insertion to ItemSlots (#15094) 2023-04-06 16:49:27 -06:00
Puro
f06ad3cf66 [Fix] Fixed base showcase robot (#15044) 2023-04-06 16:47:53 -06:00
Kara
e7e9be0073 Reagent interactivity (pt. 1) (#15130)
* Puddle slippy

* spillable melee

* splash spilling!

* splat melee sound

* p
2023-04-06 16:20:48 -05:00
Puro
e47fe6b4eb [Access] Detective personal access (#15109)
* [Access] Detective personal access

* [Add] technical airlock with detective access.

* vendind and locker change access

* Detective access on ID card console
2023-04-05 19:48:04 -07:00
Puro
14be802ae2 [Issue Solution] Dwarf Desc (#15152) 2023-04-05 17:53:40 -07:00
crazybrain23
8501f5c436 No ghost role pet suicide (#15117)
Balance
2023-04-05 20:48:02 -04:00
metalgearsloth
694a975e7f Add instant destruction thresholds to everything (#14886) 2023-04-05 16:47:02 -06:00
Moony
78c2f3da25 Do not anchor the bell, do not pass go, do not take 200 zorkmids. (#15143) 2023-04-05 16:36:19 -06:00
Interrobang01
87e05d0b12 made security's deployable barriers easier to move (#15157) 2023-04-05 16:34:51 -06:00
Emisse
0ebad0bf82 trust me bro (#15149) 2023-04-05 02:23:07 -06:00
EnDecc
a22a1f5cc4 More Musical Cargo (#15107)
* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

im sure i'll get used to this
2023-04-04 23:05:24 -06:00
Stealthbomber16
056789bd40 i wrote these changes in notepad (#15148) 2023-04-04 22:01:47 -06:00
Kara
18df657fb6 Word replacement accent system (#15086) 2023-04-03 19:50:37 -07:00
freeman2651
e6954c931a modify base sec job playtime requirements (#15116) 2023-04-03 18:10:17 -06:00
Kara
634faa0b38 Fix getting extremely drunk causing every blood vessel in your body to rupture (#15114) 2023-04-03 15:48:57 -07:00
Puro
4443850de3 [Drink] Robust nukie drink (#15051)
* [Drink] Robust nukie drink

only syndie.

* [desc]grammar fix

* [Meta] newline at the end
2023-04-03 00:42:37 -06:00
Puro
3c56ecda87 [Access] Fire axe cabinet (#15021)
* [Access] Fire axe cabinet

* fix fireaxe_cabinet.yml
2023-04-03 00:27:45 -06:00
potato1234_x
a42a2f8021 High-capacity welding fuel tank (#15019)
* high capacity fuel tank

* nerf that explosion holy shit

* e
2023-04-03 00:26:57 -06:00
crazybrain23
71caa87890 blood-red please (#15020) 2023-04-03 00:25:53 -06:00