Commit Graph

700 Commits

Author SHA1 Message Date
lapatison
cc5c590ece Adds the clown recorder (Clown fix) (#15074) 2023-04-06 20:06:52 -06:00
Whisper
1dbc75abd5 new bloodpack sprite (#15095) 2023-04-03 01:50:32 -06: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
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
potato1234_x
6bfd1d8f11 Missing box icons (#14891)
* boxes

* holo box
2023-03-30 22:46:06 -06:00
brainfood1183
ad31749b55 Desk Bell fix, Poster Rise fix, Happyhonk Mime inhand fix. (#14973)
* deskbell, poster rise fix, happyhonk mime inhand fix.

* cancollide: false
2023-03-30 22:32:57 -06:00
Lei Yunxing
cf61150ebd Adds advanced mop and research (#14917)
* add advanced mop

* make advmop clean faster

* works now

* tweak stats

* tweak speed again

* typo!!!

* copyright change for nerds
2023-03-30 22:21:54 -06:00
dontbetank
81a2b29317 plushie (#14962) 2023-03-29 17:36:54 -05:00
MisterMecky
a7571ac45b Add cardboard material (#14701)
* add cardboard material

* missing stack visualizers

* add crafting recipes

* cardboard crate

* license thing

* rename various things
2023-03-27 19:04:24 -04:00
DocNight
57094966ce desk bell from SS13 (tgstation) (#14870) 2023-03-27 10:29:09 -04:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
potato1234_x
51778afe6f TG Vending Machines + Tweaks (#14703)
* d

d

* engivend misalignment

* sustenance vendor

* Revert "sustenance vendor"

This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.

* shamblers juice

* pwrgame

* most food/drink machines

* robotech deluxe, centdrobe and some restock boxes

* copyright + salv vend

* tweaks

* restock box + more tweaks

* yaml linter fail

* divide vendor contents

* divide contents 2
2023-03-24 02:54:47 -06:00
MisterMecky
fba633a6b1 Modify and add stack sprites for wood (#14684) 2023-03-23 22:26:19 -04:00
Slava0135
620c40e087 Add explosive banana peel 2 (#14491) 2023-03-23 11:54:14 -04:00
adamsong
980c3ef799 Improved solution container visuals (#13791) 2023-03-23 14:49:42 +11:00
Nemanja
1ca6ced0cc new encryption key sprites (#14742)
* new encryption key sprites

* delete everything

* put it back
2023-03-19 20:56:11 -05:00
TaralGit
7eec71dcfc Mags and guns (#14032) 2023-03-12 20:52:57 -04:00
Alekshhh
7a87aaaf2e Space Bear 2 (#14591) 2023-03-12 01:35:52 +11:00
T-Stalker
645cc7888e beno turrets (#14516) 2023-03-11 00:25:33 +11:00
Alekshhh
1b5e80620d Held Toolbox Resprite (#14482) 2023-03-07 09:48:33 -04:00
brainfood1183
c9e70d8ea0 Cluwne smite (#13367) 2023-03-06 11:09:24 -08:00
Slava0135
b2972c1d2c Add emp grenade (#14393) 2023-03-06 11:05:12 -08:00
lapatison
5c43253d67 Lime and orange plants, citrus salad recipe (#14298) 2023-03-06 14:45:39 -04:00
Nairod
63889267ef Belt Appraisal Tools (#14413) 2023-03-06 00:23:02 -04:00
lapatison
71393c5d19 Soybean and rice plants, tofu, tofu bread recipe (#13989) 2023-03-05 22:52:03 -04:00
lapatison
2257bd3862 Encryption key boxes to the heads lockers. (#14110) 2023-03-05 22:32:08 -04:00
Fluffiest Floofers
ddfb813693 Garlic and vinaigrette (#14221) 2023-03-05 21:50:08 -04:00
Joel Hedtjärn
68b0b00328 Add the chemistry bag as the default belt for the chemist (#13965) 2023-02-19 23:34:02 -04:00
Moony
cc0c516e02 Improves bartending with some tweaks. (#14169)
* Improves bartending with some tweaks.
- Glasses got resprited and now support fill levels.
-

* New glass type and improve shotglass visuals.

* oobsy

* fixes

* get flasked

* flask

* flask

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-02-18 19:00:31 -06:00
Fluffiest Floofers
adf9ccbe8a Cabbage, Red Onion and related salads. (#14161)
* Cabbage

That's it, just cabbage.

* Up RestockSeed Cargo price.

2000 -> 2100

* Coleslawn, Caesar and Kimchi.

Requires red onions so I also added it to the list.

* Update Resources/Prototypes/Recipes/Cooking/meal_recipes.yml

Fix kimchi's incorrect name.

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

---------

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-02-18 17:52:58 -06:00
mhamster
d6c4f3118f Add atmosian plushie (#14062) 2023-02-17 13:57:14 -08:00
Nemanja
59df86fee5 Changed sci and RD icons (#13775) 2023-02-11 01:51:32 +00:00
Nemanja
f450398df7 More anomalies (#13766) 2023-02-06 01:03:53 -04:00
Nemanja
50267d9f20 Research Assistant (#13774) 2023-02-02 13:23:55 -04:00
eoineoineoin
0e56a56ca9 Rename janicart components (#13069)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2023-02-02 13:17:06 +11:00
deltanedas
7492c59633 give uranium a stacked visual (#13826)
Co-authored-by: deltanedas <deltanedas@laptop>
2023-02-02 01:21:34 +11:00
Nemanja
e04d81ec3c Paper Bins (#13449) 2023-01-31 18:03:27 -04:00
AlexMorgan3817
c8b89c7008 Encryption Keys for headsets (#12615) 2023-01-29 11:53:08 +11:00
brainfood1183
6654558046 happy honk meal box dispenser (#13490) 2023-01-22 21:08:16 -04:00
Jackrost
12fb4b2097 Spiders Buff and critters change (#13377) 2023-01-22 18:50:05 -04:00
Leon Friedrich
2904a368f7 Dice tweaks (#13514) 2023-01-21 10:51:26 +11:00
lapatison
f21534eefa Vinegar, Mayonnaise, Ketchunaise (#13288) 2023-01-20 05:46:42 -08:00
TaralGit
ab560b6976 Cult weapons (#13414)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2023-01-17 11:08:36 -07:00
eoineoineoin
bda5f8248f Improve Paper UI, allow an to entity configure how it's UI looks (#13494)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-01-17 19:32:46 +11:00
Nemanja
9cd0c11870 Anomalies (#13371) 2023-01-16 21:05:20 -08:00
Kara
7253592126 Gunify pneumatic cannon (#13296) 2023-01-16 08:56:09 -08:00
Clon clover
37e2257005 Banana Phone (: (#13321) 2023-01-16 10:06:28 -04:00
Jackrost
78deed3925 Singulo drink - speed up animation (#13484) 2023-01-15 09:01:14 -04:00
Nemanja
259b8d7e9e replace incorrectly licensed sprites (#13463) 2023-01-14 14:56:11 +11:00