From 94c56980cbca8aa2eac06cb0bcc02c6363341fe3 Mon Sep 17 00:00:00 2001 From: mirrorcult Date: Thu, 17 Feb 2022 19:42:47 -0700 Subject: [PATCH] Blood tweaks (#6767) --- Content.Server/Fluids/Components/EvaporationComponent.cs | 2 +- Resources/Prototypes/Entities/Effects/puddle.yml | 2 +- Resources/Prototypes/Reagents/Consumable/Food/food.yml | 5 +++++ Resources/Prototypes/Reagents/elements.yml | 1 - Resources/Prototypes/Reagents/medicine.yml | 3 +-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Content.Server/Fluids/Components/EvaporationComponent.cs b/Content.Server/Fluids/Components/EvaporationComponent.cs index 3b00358ea4..94f9832586 100644 --- a/Content.Server/Fluids/Components/EvaporationComponent.cs +++ b/Content.Server/Fluids/Components/EvaporationComponent.cs @@ -37,7 +37,7 @@ namespace Content.Server.Fluids.Components public FixedPoint2 LowerLimit = FixedPoint2.Zero; /// - /// Upper limit below which puddle won't evaporate. Useful when wanting to make sure large puddle will + /// Upper limit above which puddle won't evaporate. Useful when wanting to make sure large puddle will /// remain forever. Defaults to 100. /// [DataField("upperLimit")] diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index 24b2a86c0a..9c9e625518 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -101,7 +101,7 @@ - type: Puddle slipThreshold: 20 - type: Evaporation - evaporateTime: 20 # 4 times slower than normal + evaporateTime: 400 # very slow - type: Appearance visuals: - type: PuddleVisualizer diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index 6170fbc0ba..fc8d73f554 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -48,6 +48,9 @@ groups: Brute: -0.5 Burn: -0.5 + # Helps you stop bleeding to an extent. + - !type:ModifyBleedAmount + amount: -0.25 - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food - type: reagent @@ -65,5 +68,7 @@ damage: groups: Brute: -0.4 + - !type:ModifyBloodLevel + amount: 1 # weaker than iron but pretty good all things considered - !type:SatiateHunger diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index c376f320e0..7369c34bff 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -109,7 +109,6 @@ Medicine: effects: - !type:ModifyBloodLevel - scaled: true # scales 2x with the amount of iron you consume amount: 2 - type: reagent diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 7014f7d725..88b87a0f06 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -316,7 +316,6 @@ types: Asphyxiation: -5 - !type:ModifyBleedAmount - scaled: true amount: -0.25 - type: reagent @@ -461,7 +460,7 @@ # Medium-large quantities can hurt you instead, # but still technically stop your bleeding. - !type:ModifyBleedAmount - scaled: true + amount: -1.5 - !type:HealthChange conditions: - !type:ReagentThreshold