Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Medical Balance Tweaks and Fixes #597

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+46 −45
Open

Medical Balance Tweaks and Fixes #597

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e91c07a
Doubled THB amount in drinks and alchohol
Mnemotechnician Mar 2, 2025
3f4873a
Revert most of b431d24f86f94433ea0c53982db83e40ef1d3f2c
Mnemotechnician Mar 2, 2025
c12e3b3
Nerf passive body part healing
Mnemotechnician Mar 2, 2025
9e1ddd3
Make the self healing multiplier of gauze twice as small
Mnemotechnician Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Content.Server/Medical/Components/HealingComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public sealed partial class HealingComponent : Component
/// </summary>
[ViewVariables(VVAccess.ReadWrite)]
[DataField("delay")]
public float Delay = 2f; //Was 3f, changed due to Surgery Changes
public float Delay = 3f; //Was 3f, changed due to Surgery Changes # Floof - reverted

/// <summary>
/// Delay multiplier when healing yourself.
/// </summary>
[DataField("selfHealPenaltyMultiplier")]
public float SelfHealPenaltyMultiplier = 2f; //Was 3f, changed due to Surgery Changes
public float SelfHealPenaltyMultiplier = 3f; //Was 3f, changed due to Surgery Changes # Floof - reverted

/// <summary>
/// Sound played on healing begin
Expand Down
6 changes: 3 additions & 3 deletions Content.Shared/Body/Part/BodyPartComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
/// How much health to heal on the body part per tick.
/// </summary>
[DataField]
public float SelfHealingAmount = 5;
public float SelfHealingAmount = 0.5f; // Floof - reduced from 5 due to body part damage nerf. Was 10/min, now 1/min.

/// <summary>
/// The name of the container for this body part. Used in insertion surgeries.
Expand Down Expand Up @@ -159,8 +159,8 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
[DataField, AutoNetworkedField]
public Dictionary<TargetIntegrity, float> IntegrityThresholds = new()
{
{ TargetIntegrity.CriticallyWounded, 100 }, // Floof - adjusted the thresholds to come in increments of 20
{ TargetIntegrity.HeavilyWounded, 80 },
{ TargetIntegrity.CriticallyWounded, 100 }, // Floof - Increased from 90
{ TargetIntegrity.HeavilyWounded, 70 }, // Floof note: this is where "passive healing" stops
{ TargetIntegrity.ModeratelyWounded, 60 },
{ TargetIntegrity.SomewhatWounded, 40},
{ TargetIntegrity.LightlyWounded, 20 },
Expand Down
32 changes: 16 additions & 16 deletions Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
- Biological
damage:
types:
Heat: -10
Cold: -10
Shock: -10
Caustic: -3 #Was 5 per type & 1.5 caustic, Buffed due to limb damage changes # Floof - changed to 3. Who did the math on this one??
Heat: -5
Cold: -5
Shock: -5
Caustic: -1.5 #Was 5 per type & 1.5 caustic, Buffed due to limb damage changes # Floof - reverted
healingBeginSound:
path: "/Audio/Items/Medical/ointment_begin.ogg"
healingEndSound:
Expand Down Expand Up @@ -83,10 +83,10 @@
- Biological
damage:
types:
Heat: -15
Cold: -15
Shock: -15
Caustic: -15 #Was 10 per type, Buffed due to limb damage changes
Heat: -10
Cold: -10
Shock: -10
Caustic: -10 #Was 10 per type, Buffed due to limb damage changes # Floof - reverted
healingBeginSound:
path: "/Audio/Items/Medical/ointment_begin.ogg"
healingEndSound:
Expand Down Expand Up @@ -123,7 +123,7 @@
- Biological
damage:
groups:
Brute: -30 # was 5 (-15 Brute) for each, Buffed due to limb damage changes
Brute: -15 # was 5 (-15 Brute) for each, Buffed due to limb damage changes # Floof - reverted
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound:
Expand Down Expand Up @@ -172,7 +172,7 @@
- Biological
damage:
groups:
Brute: -45 # was 10 for each, now 20 for each type in the group, Buffed due to Limb Damage Changes
Brute: -30 # was 10 for each, now 20 for each type in the group, Buffed due to Limb Damage Changes # Floof - reverted
bloodlossModifier: -10 # a suture should stop ongoing bleeding
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
Expand Down Expand Up @@ -210,8 +210,8 @@
- Biological
damage:
types:
Bloodloss: -2.5 #lowers bloodloss damage, was .5, buffed due to Limb Damage Changes
ModifyBloodLevel: 30 #used to restore 5% blood per use, now restores about 10% blood per use on standard Buffed due to Limb Damage Changes
Bloodloss: -0.5 #lowers bloodloss damage, was .5, buffed due to Limb Damage Changes # Floof - reverted
ModifyBloodLevel: 15 #used to restore 5% blood per use Buffed due to Limb Damage Changes # Floof - reverted. This is NOT 5% on average (often ends up being 15%) due to mass diff.
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound:
Expand Down Expand Up @@ -276,8 +276,8 @@
- Biological
damage:
types:
Slash: -10 # Was 5
Piercing: -15 # Was 10, Buffed due to limb damage changes
Slash: -5 # Was 5 # Floof - reverted
Piercing: -10 # Was 10, Buffed due to limb damage changes # Floof - reverted
bloodlossModifier: -10
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
Expand All @@ -304,7 +304,7 @@
components:
- type: Stack
lingering: true
count: 1
count: 10 # Floof - why was this randomly changed to 1?

- type: entity
name: aloe cream
Expand All @@ -317,7 +317,7 @@
state: cream
- type: Stack
stackType: AloeCream
count: 15 #Was 10, Buffed due to limb damage changes
count: 10 #Was 10, Buffed due to limb damage changes # Floof - reverted

- type: entity
parent: BaseHealingItem
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2085,7 +2085,7 @@
amount: 0.10
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
fizziness: 0.25

- type: reagent
Expand All @@ -2112,7 +2112,7 @@
amount: 0.15
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
fizziness: 0.15

- type: reagent
Expand All @@ -2139,7 +2139,7 @@
amount: 0.10
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
fizziness: 0.15

- type: reagent
Expand All @@ -2166,7 +2166,7 @@
amount: 0.15
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
fizziness: 0.25

- type: reagent
Expand All @@ -2193,7 +2193,7 @@
amount: 0.07
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
fizziness: 0.15

- type: reagent
Expand All @@ -2220,5 +2220,5 @@
amount: 0.15
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
fizziness: 0.25
10 changes: 5 additions & 5 deletions Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
metamorphicSprite:
sprite: Objects/Consumable/Drinks/coffeeglass.rsi
state: icon_empty
Expand All @@ -38,7 +38,7 @@
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1

- type: reagent
id: Cream
Expand Down Expand Up @@ -185,7 +185,7 @@
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1

- type: reagent
id: JuiceBerryPoison
Expand Down Expand Up @@ -374,7 +374,7 @@
factor: 2
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1
metamorphicSprite:
sprite: Objects/Consumable/Drinks/teaglass.rsi
state: icon_empty
Expand Down Expand Up @@ -502,7 +502,7 @@
factor: 4
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
amount: 0.1

- type: reagent
id: Pilk
Expand Down
26 changes: 13 additions & 13 deletions Resources/Prototypes/Reagents/medicine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
- !type:HealthChange
damage:
types:
Poison: -1.5 # Was 1, Slight Buff as it should heal for half the amount as Dip or Stelli
Poison: -1 # Was 1, Slight Buff as it should heal for half the amount as Dip or Stelli # Floof - reverted - why did you touch this??
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -153,7 +153,7 @@
- !type:HealthChange
damage:
groups:
Brute: -2.5 # Was 2, Buffed due to limb damage changes
Brute: -2 # Was 2, Buffed due to limb damage changes # Floof - reverted
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -242,9 +242,9 @@
- !type:HealthChange
damage:
types:
Heat: -2
Shock: -2
Cold: -2 # Was 1.5, Buffed due to limb damage changes
Heat: -1.5
Shock: -1.5
Cold: -1.5 # Was 1.5, Buffed due to limb damage changes # Floof - reverted
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -342,8 +342,8 @@
Asphyxiation: -3
Poison: -0.5
groups:
Brute: -1
Burn: -1 # Was .5, Buffed due to limb damage changes
Brute: -0.5
Burn: -0.5 # Was .5, Buffed due to limb damage changes # Floof - reverted
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -818,10 +818,10 @@
- !type:HealthChange
damage:
groups:
Burn: -3
Toxin: -3
Airloss: -3
Brute: -3 # Was 2, Buffed due to limb damage changes
Burn: -2
Toxin: -2
Airloss: -2
Brute: -2 # Was 2, Buffed due to limb damage changes # Floof - reverted

- type: reagent
id: Ultravasculine
Expand Down Expand Up @@ -995,7 +995,7 @@
- !type:HealthChange
damage:
types:
Slash: -4 # Was 3, Buffed due to limb damage changes
Slash: -3 # Was 3, Buffed due to limb damage changes # Floof - reverted
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -1042,7 +1042,7 @@
- !type:HealthChange
damage:
types:
Blunt: -4 # Was 3, Buffed due to limb damage changes(GoobStation)
Blunt: -3.5 # Was 3, Buffed due to limb damage changes(GoobStation) # Floof - reverted
Copy link
Contributor

@Forzii Forzii Mar 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lace got dropped back to 3 but bruiz only to 3.5?
Edit: Oh nevermind, ignore me. Before the change punct was 4, lace 3, and bruiz 3.5 so you're just reverting. I just didn't expect it to be like that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I used the git diff of b431d24 to revert it.

- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down
Loading