Commit Graph

1670 Commits

Author SHA1 Message Date
EnDecc
5ed99bf497 [Tweak] Janibucket buffs (#15422)
* Improves Janitor trolley significantly by adding bucket slot with sprite overlay, and 300 extra water capacity. Improves Janitor bucket slightly by adding 100 extra water capacity.

* Reduces janitor trolley density by 100 to it's pull a bit faster
2023-04-15 16:46:00 -06:00
Puro
d639b0c002 [Sprite] Toy Mouse is hat!? (#15425) 2023-04-15 16:44:00 -06:00
Puro
a3102147ca [Entity] Centcom PDA (#15415)
* [PDA] Centcom PDA

* Centcom pen update

* sheesh

* Pen based on CyberPen
2023-04-15 16:43:15 -06:00
Nemanja
ca4c523635 Remove brigmedic hypospray (#15426) 2023-04-16 01:07:13 +10:00
Slava0135
7886d27dda Add radio jammer (#14369) 2023-04-14 12:50:19 -07:00
potato1234_x
41f8b401da Misc sprite changes (#15011) 2023-04-14 12:43:49 -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
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
brainfood1183
318cbc4146 Craftable Clown Hardsuit (#15317)
* clownhardsuit

* clothing construction catagory
2023-04-12 02:52:08 -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
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
potato1234_x
5a4e93fabd [Entity] Sustenance Vendor (#15119)
* sustenance vendor

* emaggedinventory
2023-04-09 16:00:23 -06:00
Puro
2c8d148bca [Sprites] Adds in hand sprites (#15244) 2023-04-09 15:42:17 -06:00
lzk228
7be21a62ec Added clown satchel (#15225) 2023-04-08 19:24:44 -07:00
JerryTheMouse
a16c29ce73 Janimaid sprite fix (#15202)
There was some additional pixels, when you keep janimaid's jumpskirt in hands. I just changed the sprite a little
2023-04-07 14:10:35 -06:00
lapatison
cc5c590ece Adds the clown recorder (Clown fix) (#15074) 2023-04-06 20:06:52 -06:00
potato1234_x
5eee828c05 tiny poster tweaks (#15125) 2023-04-04 00:29:03 -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
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