Commit Graph

109 Commits

Author SHA1 Message Date
JoeHammad1844
70da001b41 Brute and Burn auto-injectors (#18401) 2023-08-06 12:38:25 +10:00
Vasilis
99aa7e52c7 Plunger is now a hat (#18410)
* the plunger

* Copyright webedit
2023-07-28 18:10:45 -06:00
Slava0135
7f76dd11b3 more visible explosive banana peel (#18105)
* more visible explosive banana peel

* i am idiot
2023-07-17 13:35:58 -06:00
Arendian
b4c251472f Adds Advanced ointment and bruisepack recipes (#17583)
* Adds Advanced ointment and bruisepack recipes

* Changes the sprites to the ones from /tg

* Changed names and sprites, slight tweaks

* Formatting

* Solve Conflict

* Formatting

* Fix issues found in check

* Fix Oopsie
2023-07-09 20:22:10 -06:00
Topy
b85c902189 Added sink (#14348) 2023-06-30 18:10:47 -04:00
brainfood1183
f2d3ea9117 Hamster resprite by RamZ and hamster can wear some clothing, monkey eva resprite. (#17439) 2023-06-29 18:36:19 -04:00
Nemanja
bdbd01fbaf node scanner resprite (#17609) 2023-06-24 14:20:26 +10:00
Nemanja
0d0bef455e artifact resprite (#17417) 2023-06-19 01:02:27 +10:00
Nemanja
0b5ccf3395 Artifact Fragments (#17420) 2023-06-19 00:56:45 +10:00
lzk
b31c848418 [Sprites] guitar back and some resprites (#16611) 2023-06-15 21:55:06 +10:00
Nemanja
fa23d57fd8 Remove cloning tech, add bluespace chemistry tech (#17345) 2023-06-14 21:11:11 -06:00
brainfood1183
cd7d4be188 HAMTR mech (hamster mech) (needs review) (#16393)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-08 16:33:35 +10:00
Slava0135
9abe2900b7 less syringe fill states (#16744) 2023-05-23 13:06:35 -06:00
Vasilis
4f8d4f89d6 Health analyzer displays turns off when the battery dies (#16125) 2023-05-13 12:28:11 -04:00
deltanedas
bc101e1fb5 H.O.N.K. mech (#14670)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-05 23:21:13 +10:00
brainfood1183
d72f7d57c6 Adds Mimebot (#16019) 2023-05-05 23:15:49 +10:00
Lei Yunxing
b1391b35ef adds damp rag (#15553)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-03 10:01:55 -07:00
Nemanja
0604c93d50 Defibrillator (#15922)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-03 10:10:19 +10:00
lzk228
7181a095ad [Sprite] inhand sprites for bags (#16005) 2023-05-02 18:24:37 +10:00
Chris
e6012a3956 Add secure chemistry crates and jugs (#15211) 2023-04-24 09:53:17 +10:00
Nemanja
fadee354db Anomaly Locator (#15677) 2023-04-23 15:39:33 +10:00
Nemanja
e4642cefcb [entity] Mega Spray Bottle (#15558) 2023-04-21 03:16:33 -06:00
Puro
7a5fb7ea67 [Sprite] Stimpack Sprite (#14987)
* [Sprite] Stimpack Sprite

* updated meta.json
2023-04-19 01:41:10 -04:00
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
Nemanja
ca4c523635 Remove brigmedic hypospray (#15426) 2023-04-16 01:07:13 +10: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
Whisper
1dbc75abd5 new bloodpack sprite (#15095) 2023-04-03 01:50:32 -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
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
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
Slava0135
620c40e087 Add explosive banana peel 2 (#14491) 2023-03-23 11:54:14 -04:00
lapatison
5c43253d67 Lime and orange plants, citrus salad recipe (#14298) 2023-03-06 14:45:39 -04:00
lapatison
71393c5d19 Soybean and rice plants, tofu, tofu bread recipe (#13989) 2023-03-05 22:52:03 -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
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
brainfood1183
6654558046 happy honk meal box dispenser (#13490) 2023-01-22 21:08:16 -04:00
Nemanja
9cd0c11870 Anomalies (#13371) 2023-01-16 21:05:20 -08:00
Nemanja
259b8d7e9e replace incorrectly licensed sprites (#13463) 2023-01-14 14:56:11 +11:00
Vordenburg
5553976d70 Add supplies to restock vending machines. (#11506) 2023-01-01 15:42:56 -08:00
dontbetank
d57f9b6a48 Librarian QoL (#12958) 2022-12-21 06:53:10 -08:00
Pieter-Jan Briers
14f8b4e6d5 Use new validate-rsis for workflow (#12997)
* Use new validate-rsis for workflow

* A

* Add python deps

* --ignore-installed

* Make it only work on RSI changes again.

* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
Nemanja
3b48051e33 Node Scanner (#12889)
* node scanners + new tech

* Sue me for making my shit copyright free
2022-12-19 21:53:54 -06:00
Nemanja
913e1ee676 Exosuit: Ripley (#12668)
* mechs

* interaction relay

* atmos handling

* fuck around with interaction events

SPAGHETTI CODE OH MY GOD

* more sprites and whatever the hell

* more mech shit

* more shit for equipment

* starting equipment (for nukie mechs and such)

* equipment cycling

* starting with some of the ui

* a fat chunk of ui prototyping

* done tinkering with ui

* a bunch of ui stuff and what have yous

* cleaning up grabber and state handling

* make the ui actually functional + watch me port a million icons

I swear i'll prune the sprites later blease

* start on construction

* construction yo mamma

* remove some unused files

* fix a silly

* make the graph sane

* make it actually constructible.

* print the boards as well, bozo

* rebalance part prices

* eject action

also i appease the russians by remembering to localize

* Punch Shit

* make mech integrity and repairs work

* Make the UI more based

STOMP STOMP STOMP STOMP

* make equipment even more based

* batteries and other such delights

* make the ui look pimpin af

* make the construction mega based

* UI but so epic

* equipment

* some sweat tweaks

* damage rebalancing

* restructure tech

* fix some shit

* mechs inherit access

* make icons actually use sprite specifiers

* TRAILING COMMAA!!!!!

* fix a mild indentation sin

* undo this change because it isn't needed

* actually fix this

* secret webeditting shhhh

* place this tech here

* comments

* foo
2022-12-10 11:05:39 -06:00
Easypoller
001c755a94 Mop usable as weapon (#12864) 2022-12-05 18:28:00 -08:00
Pieter-Jan Briers
b707b788ac Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
Nemanja
257a9db5c1 xenoarch inhands + a few effects (#12655) 2022-11-17 15:10:45 -08:00
Kara
eaa7c0dd36 Item artifacts (#12652) 2022-11-17 09:40:05 -08:00
Nemanja
72e7a9ee93 RPED (#12008)
* RPED

* sound effect

* wires must be open

finished me appy slices yum yum

* Update Resources/Audio/Items/attributions.yml

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update attributions.yml

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-11-14 13:36:13 -06:00