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.

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

Buff Medical Due to Shitmed Changes Cherry-Pick #1259

Merged
merged 7 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
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 = 3f;
public float Delay = 2f; //Was 3f, changed due to Surgery Changes

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

/// <summary>
/// Sound played on healing begin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
- Biological
damage:
types:
Heat: -5
Cold: -5
Shock: -5
Caustic: -1.5
Heat: -15
Cold: -15
Shock: -15
Caustic: -10 #Was 5 per type & 1.5 caustic, Buffed due to limb damage changes
healingBeginSound:
path: "/Audio/Items/Medical/ointment_begin.ogg"
healingEndSound:
path: "/Audio/Items/Medical/ointment_end.ogg"
- type: Stack
stackType: Ointment
count: 10
count: 15 #Was 10, Buffed due to limb damage changes
- type: StackPrice
price: 5
price: 10 #Was 5, Buffed due to surgery changes

- type: entity
id: Ointment1
Expand Down Expand Up @@ -83,19 +83,19 @@
- Biological
damage:
types:
Heat: -10
Cold: -10
Shock: -10
Caustic: -10
Heat: -20
Cold: -20
Shock: -20
Caustic: -20 #Was 10 per type, Buffed due to limb damage changes
healingBeginSound:
path: "/Audio/Items/Medical/ointment_begin.ogg"
healingEndSound:
path: "/Audio/Items/Medical/ointment_end.ogg"
- type: Stack
stackType: RegenerativeMesh
count: 10
count: 15 #Was 10, Buffed due to limb damage changes
- type: StackPrice
price: 20
price: 40 #Was 20, Buffed due to limb damage changes

- type: entity
id: OintmentAdvanced1
Expand Down Expand Up @@ -123,16 +123,16 @@
- Biological
damage:
groups:
Brute: -15 # 5 for each type in the group
Brute: -45 # was 5 for each, Buffed due to limb damage changes
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound:
path: "/Audio/Items/Medical/brutepack_end.ogg"
- type: Stack
stackType: Brutepack
count: 10
count: 15 #Was 10, Buffed due to limb damage changes
- type: StackPrice
price: 5
price: 10 #Was 5, Buffed due to limb damage changes

- type: entity
id: Brutepack1
Expand Down Expand Up @@ -172,17 +172,17 @@
- Biological
damage:
groups:
Brute: -30 # 10 for each type in the group
Brute: -60 # was 10 for each, now 20 for each type in the group, Buffed due to surgery changes
bloodlossModifier: -10 # a suture should stop ongoing bleeding
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound:
path: "/Audio/Items/Medical/brutepack_end.ogg"
- type: Stack
stackType: MedicatedSuture
count: 10
count: 15 #Was 10, Buffed due to surgery changes
- type: StackPrice
price: 20
price: 40 #Was 20, Buffed due to limb damage changes

- type: entity
id: BrutepackAdvanced1
Expand Down Expand Up @@ -210,17 +210,17 @@
- Biological
damage:
types:
Bloodloss: -0.5 #lowers bloodloss damage
ModifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
Bloodloss: -2.5 #lowers bloodloss damage, was .5 buffed to 5 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
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound:
path: "/Audio/Items/Medical/brutepack_end.ogg"
- type: Stack
stackType: Bloodpack
count: 10
count: 15 #Was 10, Buffed due to limb damage changes
- type: StackPrice
price: 10
price: 20 #Was 10, Buffed due to limb damage changes

- type: entity
parent: Bloodpack
Expand Down Expand Up @@ -276,18 +276,18 @@
- Biological
damage:
types:
Slash: -5
Piercing: -10
Slash: -15 # Was 5
Piercing: -20 # Was 10, Buffed due to limb damage changes
bloodlossModifier: -10
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound:
path: "/Audio/Items/Medical/brutepack_end.ogg"
- type: Stack
stackType: Gauze
count: 10
count: 15 #Was 10, Buffed due to limb damage changes
- type: StackPrice
price: 10
price: 20 #Was 10, Buffed due to limb damage changes

- type: entity
id: Gauze1
Expand Down Expand Up @@ -317,7 +317,7 @@
state: cream
- type: Stack
stackType: AloeCream
count: 10
count: 15 #Was 10, Buffed due to limb damage changes

- type: entity
parent: BaseHealingItem
Expand Down
38 changes: 19 additions & 19 deletions Resources/Prototypes/Reagents/medicine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
- !type:HealthChange
damage:
types:
Poison: -1
Poison: -1.5 # Was 1, Slight Buff as it should heal for half the amount as Dip or Stelli
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -153,7 +153,7 @@
- !type:HealthChange
damage:
groups:
Brute: -2
Brute: -2.5 # Was 2, Buffed due to limb damage changes
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -236,9 +236,9 @@
- !type:HealthChange
damage:
types:
Heat: -1.5
Shock: -1.5
Cold: -1.5
Heat: -2
Shock: -2
Cold: -2 # Was 1.5, Buffed due to limb damage changes
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -336,8 +336,8 @@
Asphyxiation: -3
Poison: -0.5
groups:
Brute: -0.5
Burn: -0.5
Brute: -1
Burn: -1 # Was .5, Buffed due to limb damage changes
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -455,9 +455,9 @@
- !type:HealthChange
damage:
types:
Heat: -0.33
Shock: -0.33
Cold: -0.33
Heat: -0.5
Shock: -0.5
Cold: -0.5 # Was .33, Buffed due to limb damage changes
- !type:SatiateThirst
factor: -10
conditions:
Expand Down Expand Up @@ -778,9 +778,9 @@
Brute: -1
types:
Poison: -0.5 ##Should be about what it was when it healed the toxin group
Heat: -0.33
Shock: -0.33
Cold: -0.33
Heat: -0.5
Shock: -0.5
Cold: -0.5 # Was .33, Buffed due to limb damage changes

- type: reagent
id: Lipozine
Expand Down Expand Up @@ -812,10 +812,10 @@
- !type:HealthChange
damage:
groups:
Burn: -2
Toxin: -2
Airloss: -2
Brute: -2
Burn: -3
Toxin: -3
Airloss: -3
Brute: -3 # Was 2, Buffed due to limb damage changes

- type: reagent
id: Ultravasculine
Expand Down Expand Up @@ -989,7 +989,7 @@
- !type:HealthChange
damage:
types:
Slash: -3
Slash: -4 # Was 3, Buffed due to limb damage changes
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down Expand Up @@ -1036,7 +1036,7 @@
- !type:HealthChange
damage:
types:
Blunt: -3.5
Blunt: -4 # Was 3, Buffed due to limb damage changes(GoobStation)
- !type:HealthChange
conditions:
- !type:ReagentThreshold
Expand Down
Loading