Commit Graph

193 Commits

Author SHA1 Message Date
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
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
Interrobang01
018ba85885 Cryptobiolin is now true to its description (#14844) 2023-03-26 18:03:06 -07:00
deltanedas
a5f99dc949 dylo has 30u overdose (#14831)
* dylo has 30u overdose

* 😔

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-03-24 13:13:22 -05: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
Maxtone
33cf53d6cf Fix Caustic damage group, Health Analyzer damage groups, change caustic to a damage type, add resistances (#14218) 2023-03-22 23:38:35 -04:00
Moony
0290e20256 Revert "Mutation Toxins (#14314)" (#14726)
This reverts commit a7f9b2881b.
2023-03-17 19:50:16 -05:00
QuantumSeanyGlass
a7f9b2881b Mutation Toxins (#14314) 2023-03-13 16:16:04 -04:00
GoodWheatley
56f2474213 Stimpacks 1.1.1 - Intended Behavior Edition (#14608) 2023-03-12 16:38:32 -07:00
lapatison
cb8909ce17 MInor stimpack physicalDesc fix (#14461) 2023-03-06 18:49:37 -04:00
GoodWheatley
f826ee3518 Stimpacks - 100% Webedit Free Edition (#13810) 2023-03-06 01:28:14 -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
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
Scribbles0
9d49f476a8 Narcolepsy medication tweaks (#13710) 2023-01-27 17:11:06 -04:00
Alex Evgrashin
ef452b38a9 Audible emotes (#12708)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2023-01-25 08:29:41 -08:00
lapatison
a2dd3af7c2 Few physical description fixes (#13634) 2023-01-21 11:39:32 -04:00
Rane
3df788e3f8 pass on food digestion (#12312)
Closes https://github.com/space-wizards/space-station-14/issues/8889
2023-01-20 08:01:11 -08:00
lapatison
f21534eefa Vinegar, Mayonnaise, Ketchunaise (#13288) 2023-01-20 05:46:42 -08:00
nikthechampiongr
529c011501 Epinephrine can now stabilize animals in critical condition (#13277) 2023-01-16 17:47:41 -08:00
Scribbles0
27263892ef Narcolepsy Treatment (#13427)
* ResetNarcolepsy.cs and NarcolepsySystem.cs changes

* fix multiple narcolepsy incidents

* comment

* Update Content.Server/Chemistry/ReagentEffects/ResetNarcolepsy.cs

Co-authored-by: 0x6273 <0x40@keemail.me>

* try to fix tests

Co-authored-by: 0x6273 <0x40@keemail.me>
2023-01-11 02:14:16 -06:00
Leon Friedrich
1f5bae751f MaterialComponent cleanup (#13326) 2023-01-07 14:36:32 -08:00
Rane
fecd60e98a Generalized material spawning (#12489) 2023-01-08 05:09:05 +11:00
Nemanja
a47dd2a9b0 Spaceacillin Tweaks (#13224) 2022-12-28 20:44:53 -08:00
Rane
8613d40aa1 Scale other needed metabolism reagents (#12005)
Closes https://github.com/space-wizards/space-station-14/issues/7434
2022-12-21 06:51:49 -08:00
Vordenburg
815caa2296 Fix Bloodstream typo. (#12923) 2022-12-19 21:56:10 -06:00
Pieter-Jan Briers
10a99617b8 Remove usages of texture: .rsi/*.png and such. (#12896) 2022-12-06 13:11:37 +11:00
Vordenburg
58752b6973 Fix some typos. (#12748) 2022-11-28 13:37:58 +11:00
Mervill
07da6ba416 Rename Kahlua to Coffee Liqueur (#12525)
Closes https://github.com/space-wizards/space-station-14/issues/10486
2022-11-16 12:59:43 -08:00
corentt
f9bf24f903 Price of food depends on its nutritional capacity (#11752)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
fixes https://github.com/space-wizards/space-station-14/issues/11464
2022-11-15 22:51:30 +11:00
Interrobang01
5f35158d88 Cognizine tweaks (#12560)
* replaced muta in recipe to acetone

* now it tastes magical

* cogni monkeys can talk
2022-11-14 20:02:46 -06:00
Nemanja
fd9bedae9a New Species: Diona (#11497)
* new species: Diona

* more diona stuff

* dey breathing now

* test fixe

* fix a merge

* now actually fix the merge

* foobar

* oversight

* ok now the rest of em
2022-11-08 14:26:59 -06:00
Nairod
fd855a2c4b Blindness inducing chemical (#12041) 2022-10-30 18:09:59 +11:00
Interrobang01
9904eae75c Cognizine, a chemical that makes an entity sentient and a ghost role (#11992) 2022-10-22 15:05:06 -07:00
Scribbles0
294b4577c1 sleepy (#11857) 2022-10-14 23:10:46 -05:00
router
8c4c3d2ec6 Make capsaicin oil spicy (#11699) 2022-10-09 12:25:22 -07:00
Morb
f65cdd13d8 Fix drinks locale (#11722) 2022-10-07 16:55:05 +11:00
Flipp Syder
b1525953d4 watermelon flavor (#11701) 2022-10-05 21:54:18 -05:00
metalgearsloth
ad7a851e27 Cargo economy balance (#11123)
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
2022-09-15 11:53:17 +10:00
Morb
89367f71e4 Localize material names (#11059) 2022-09-14 13:00:08 +10:00
Kara
eaa4bc4aea Remove clonexadone (#11253) 2022-09-13 12:51:31 -07:00
Will Robson
7accbcbe9b Implement Charcoal. #10042 (#11024)
* Add charcoal

Flush chemicals that are not the charcoal out of the chemical stream

* Add into EN localization to get chem dispenser to display correctly

* Remove method that wasn't needed

* Remove charcoal from dispenser

Charcoal is made by combing ash and carbon

* Place ash in elements prototype
2022-09-10 18:20:44 -05:00
Flipp Syder
3cfa00e91c Flavor profiles (#10991)
* flavor profiles

TODO: every single flavor! yeah!!!

* adds basic localization, and flavors/lastFlavor values for when you get the flavor profile message

* multiple and single flavor messages

* start on flavor localization, multiple flavors in localized flavors

* flavor prototypes

* a few more flavors, descriptions on what each section of the flavor file should be doing

* localization for flavor profiles in drink/food system

* adds an event that allows a flavor profile list to be transformed base on the user entity

* raises it on the food entity too

* changes a field in flavor, adds some more flavors, starts adding flavor prototypes

* adds basic flavors to several entities, and consumable drinks, renames flavor field to 'flavors'

* changes call ordering in flavorprofile, adds flavor to ignored components server-side

flavor is really just a popup message, and those are all processed server-side

* fixes where food tried to get the flavor of the user instead of the food

* single flavors will now get the localized string

* getting the flavor message now ensures that flavors are deduplicated

* makes flavor processing more strictly unique bu making everything hashsets

* yeah, that could just not have distinctby now

* adds flavorprofile directly to food base instead for generic food taste

* FlavorProfileModificationEvent now passes a hashset of strings and not flavorprototypes

* flavorprofilesystem now broadcasts the flavor profile modification event

* adds more flavors to the flavor profile loc file

* skips a flavor, if the flavor string is null/empty

* adds some more flavors, adds generic medicine flavor to medicinal chemicals

* more food flavors, adds flavors to swallowing

* adds some cocktails to the set of flavor profiles

* regenerates flavor prototypes

* adds flavor type to all flavors, adds whitespace between variants

* adds more flavors, adds flavors to several chemicals and food items

this is the part that took the longest

* changes backup flavor message

* spelling mistake

* more flavors, and flavors on food

* readds all the type fields, whoops

* fixes localization strings for forcefeeding food/drink

* fixes multiple flavor profile

* adds flavor limit for flavors

* makes that fetch the cvardef instead
2022-09-08 18:14:49 -05:00
Rane
a29e86a896 Pacification status effect and Pax (#10796) 2022-09-05 19:52:58 -07:00
Rane
f36d278499 Biomass (#10313)
* Material

* good prototype

* Fix material storage

* You can insert biomass into the cloner

* ok, basic biomass subtraction works

* amogus

* ok chance works

* Alright, the biomass and genetic stuff works

* feedback for cloning

* more reclaimer polish

* ship it

* starting biomass + fix lathes

* I changed my mind on rat mass and these guys are definitely getting ground up

* Doafter

* clean up, sync the two

* fix naming, fix mass

* technology + construction

* additional logging, stop unanchoring when active

* fix event / logs

* dont gib dead salvage

* auto eject

* fix deconstruction behavior

* make warning message better, temporarily disable cancer scanner

* fix biomass stacks

* add easy mode CVAR

* stack cleanup, make biomass 2x as fast

* bugfix

* new sprite from hyenh

* fix tests

* hello? :smilethink:

* :smilethink:

* medical scanner gets antirotting

* fix cloner and medical scanner

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-08-29 21:31:27 -05:00
Myctai
124cd06fd2 Give Barozine in OD emetogenic effect, halved chance compared to Ipecac (#10753) 2022-08-22 03:50:45 -05:00
Rane
572a4f7fb3 Eye damage (#10262) 2022-08-13 22:59:14 -07:00
Kara
b947151d9a Bucket solution fills + ECS SolutionContainerVisualizer (#10289) 2022-08-07 01:50:52 -07:00
Kevin Zheng
b3db693c6c Fix plant clonexadone (#10371) 2022-08-06 18:09:51 -07:00