Commit Graph

4173 Commits

Author SHA1 Message Date
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
Puro
88f0b3d4ed [Clothing] watermelon helmet (#15025) 2023-04-03 00:25:14 -06:00
lzk228
37cbe4cc0b Scientific beret (#15042)
* Added scientific beret

* Added scientific beret

* Scientific beret added to RD's locker
2023-04-03 00:23:29 -06:00
Lei Yunxing
edef526a37 Adds holobarrier projector to warden and HOS lockers (#15091)
* adds holobarrier projector and adds it to warden&hos locker

* a
2023-04-03 00:20:15 -06:00
Whisper
0e43f90bb8 The bleed update (#14814)
* Removed arbitrary modifier scaling. The bleed amount is now 1-1 in units.

* Added some comments to explain the blood and bleed code

* added some comments

* added some comments

* profusely bleeding message scales with max bleed rate

* Added some comments

* Added some comments (tm)

* Halved the speed bleed rate heals.

* Changed the wording of a comment to make the function of the values more clear

* Changed bleed rate values, made heat heal more bleed rate

* doubled crit chance, since damage types were reduced

* Made iron restore more blood, 2->4u per 1u

* Starting to add the blood pack

* add bloodlevel to healingcomponent

* Created code support in the healing system for restoring blood

* first test of blood pack prototype

* More pack testing, and defining the yml stack

* yml syntax fix

* adds bloodpack tag

* Successfully added the item, but the effect and deletion after using the item is not working yet.

* the blood regen worksgit add -A!

* blood pack is entirely functioning

* Removed bleed rate healing from brute pack

* Comment correction

* I tried

* Removed bleed stats from corrupted corgi, they inherit same stats from basemob

* Removed bleed stats from xeno, they inherit same stats from a base mob

* Removed bleed stats from diona, they inherit same stats from a base mob

* Removed bleed stats from slimes, they inherit same stats from a base mob

* All mobs now heal bloodloss damage at a rate of 1 instead of 0.25 when healthy

* The cautery now closes bleed wounds

* Nerf blood pack bleed rate heal

* Added 2 blood packs to medicine locker

* Added 2 blood packs to wall medicine locker

* Minor YML fix to chemistry locker, no changes in game

* Added tag to medical belt for blood pack, added 2 blood packs to medical belt

* Added 1 gauze to medical belt

* 5 blood packs addded to nanomed plus

* nanomed inventory change

* 2 blood packs added to medical supplies crate from cargo

* Moved 1 gauze from med kit to advanced med kit

* Moved 1 tricord pill from advanced med kit to basic med kit

* added 2 ointment to burn kit

* Moved ina syringe from burn treatment to oxygen kit

* Removed one gauze from brute kit

* Added one bloodpack to brute med kit

* Moved tranex acid syringe from advanced first aid to brute kit

* Poison medipen moved from advanced first aid kit to toxin kit

* Removed health analyzer from advanced first aid kit

* removed one brute pack from advanced aid kit

* added one ointment to advanced aid kit

* Added one blood pack to advanced aid kit

* Added 2 blood packs to combat med kit

* Starting with adding the license for the tg sprite

* Adds the blood pack sprite and meta.json code

* I forgor to actually code the sprite in

* Advanced med kit missing one blood pack

* Replaced tricord pill with emergency medipen in cobat kit

* Removed emergency pen from combat kit, there's no space for it

* Revert "I tried"

This reverts commit 94c2e28df3200993d3f09b72ecabc838ea5ae5c0.

* Trying to fix yml test fail

* Try again

* attempt number 3

* Restock crate price was too low

* fixing merge conflict without making a HUGE mess this time

* ???

* again

* again

* Can I add the newline now maybe???

* Revert "Can I add the newline now maybe???"

This reverts commit 22d26706a65a24633f7da1dea6315012e2d3ac6f.

* Adds the doafter fix code from Keron to the blood level healing

* minor typo fix

* Feedback from Emisse and sloth; Removed chance based feedback on cauterizing

* comment fix
2023-04-02 23:59:51 -06:00
Kara
22db95faaa Dwarf minor content (#15082)
* alcohol & body stuff

* vocal changes

* accent

* dumb
2023-04-02 22:28:49 -05:00
Puro
3319666c58 [Cargo crate] Crate for theatrical performances (#15072) 2023-04-03 12:45:41 +10:00
Emisse
83b342ab5f Re Enable Dwarves (#15079) 2023-04-02 17:06:24 -07:00
adamsong
bcb07142ae Allow ghosts to hear radio message globally (#15078) 2023-04-02 18:56:07 -05:00