Commit Graph

1248 Commits

Author SHA1 Message Date
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
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
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
Moony
eee96125df Revert "Moony z level hack (#15031)" (#15032)
This reverts commit 1f6663912b.
2023-03-31 21:50:11 -05:00
Moony
1f6663912b Moony z level hack (#15031)
* save work

* Adds Z levels

* a

* ladders + parallax scroll

* zoom out not in

* oops, sandbox

* oops i broke the law

* run ci

* fuck

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-03-31 21:49:10 -05: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
potato1234_x
dbf9f71ee8 vend tweaks and clothes (#14961) 2023-03-30 22:31:51 -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
Puro
3e7ff70d31 [Clothing] Moth cloak and mask (#14851)
* Moth cloak

* Update meta.json

* Update meta.json

* fixed moth mask

yes.

* Moth mask now hides hair

yes.

* now the moth's cloak will spawn on the map

yes
2023-03-26 13:11:43 -06:00
deltanedas
3cd30c408b add signal valve (#14830)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-03-25 16:16:27 -07:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
Alekshhh
230e058593 Cerberus Resprite (#14653) 2023-03-24 16:28:29 -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
Nemanja
52ef1dd7f0 Revert "Paperwork Resprite (#14568)" (#14698)
This reverts commit 6c2edad3bd.
2023-03-23 12:53:27 -04:00
Alekshhh
453ae9d958 Dame Dane Change (#14686) 2023-03-23 12:51:49 -04:00
Riley constable
5fcac6cac5 Added light post sprites (#14533) 2023-03-23 12:12:33 -04:00
Slava0135
620c40e087 Add explosive banana peel 2 (#14491) 2023-03-23 11:54:14 -04:00
potato1234_x
a7bafa58f1 Hydroponics Sprite Changes (#14649) 2023-03-23 11:10:18 -04:00
adamsong
980c3ef799 Improved solution container visuals (#13791) 2023-03-23 14:49:42 +11:00
ssdaniel24
8cff034f52 Added janitoral uniform with miniskirt (#14050) 2023-03-22 23:39:12 -04:00
T-Stalker
002d65cc8c Re-sprite the riot suit (#14621) 2023-03-22 15:18:34 +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
Flareguy
854f88d69c Waist bags (#14474)
* Everything (hopefully)

* makes them actually obtainable (oops)

* renames the fannypack to "waist bag"

* Removes and replaces remaining mentions of fannypacks

* oops
2023-03-19 17:45:38 -07:00
Moony
c3dcc7a124 Flash now flashes black instead of white. (#14642) 2023-03-14 16:37:21 +11:00
potato1234_x
33f937cdc4 Frezon Canister Tweaks (#14442) 2023-03-13 23:42:07 -04:00
potato1234_x
b15c9abc60 Missing Uniform Held sprites (#14584) 2023-03-13 20:12:58 -04:00
Alekshhh
e460963964 Added Warden's Hardsuit (#14521) 2023-03-13 13:47:56 -04:00
potato1234_x
8006f985a2 Fix Engivend Sprite Misalignment (#14618) 2023-03-13 13:22:52 +11:00
TaralGit
7eec71dcfc Mags and guns (#14032) 2023-03-12 20:52:57 -04:00
Flareguy
d1f3cf6b4b Fixes the blood red hardsuit sprite being identical to the syndicate commander hardsuit (#14552) 2023-03-12 16:42:42 -07:00
Alekshhh
7a87aaaf2e Space Bear 2 (#14591) 2023-03-12 01:35:52 +11:00
Alekshhh
6c2edad3bd Paperwork Resprite (#14568) 2023-03-11 01:34:46 +11:00
Alekshhh
47253bfaeb Space Bear Minor Overhaul (#14566) 2023-03-11 00:45:44 +11:00
T-Stalker
645cc7888e beno turrets (#14516) 2023-03-11 00:25:33 +11:00
metalgearsloth
6157dfa3c0 Salvage dungeons (#14520) 2023-03-10 16:41:22 +11:00
Alekshhh
1b5e80620d Held Toolbox Resprite (#14482) 2023-03-07 09:48:33 -04:00
James Simonson
3bcd319ae4 Enhanced APC UI + New NT logo to footer (#14258) 2023-03-06 21:55:35 -04:00
Checkraze
7c933160e6 Aspid Parallax (#14359) 2023-03-06 20:33:03 -04:00
Menshin
b76547e6df Fixes atmos trinary devices connectors sprites (#14248) 2023-03-06 20:08:03 -04:00
Slava0135
e4b1a363f5 Add telecommunication server (#14415) 2023-03-06 17:11:36 -04:00
Flareguy
78bef79609 Alternate atmos & sci jumpsuits + minor tie sprite changes (#14305) 2023-03-06 15:42:10 -04:00