diff --git a/Content.Server/Medical/Components/HealingComponent.cs b/Content.Server/Medical/Components/HealingComponent.cs
index a56bc171432..94ad4b57c2d 100644
--- a/Content.Server/Medical/Components/HealingComponent.cs
+++ b/Content.Server/Medical/Components/HealingComponent.cs
@@ -43,13 +43,13 @@ public sealed partial class HealingComponent : Component
///
[ViewVariables(VVAccess.ReadWrite)]
[DataField("delay")]
- public float Delay = 3f;
+ public float Delay = 2f; //Was 3f, changed due to Surgery Changes
///
/// Delay multiplier when healing yourself.
///
[DataField("selfHealPenaltyMultiplier")]
- public float SelfHealPenaltyMultiplier = 3f;
+ public float SelfHealPenaltyMultiplier = 2f; //Was 3f, changed due to Surgery Changes
///
/// Sound played on healing begin
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 1addf523e4b..1b8f3547555 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -4,7 +4,7 @@
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: firstaid
product: CrateMedicalSupplies
- cost: 2400
+ cost: 3000
category: cargoproduct-category-name-medical
group: market
@@ -74,7 +74,7 @@
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: advkit
product: CrateEmergencyAdvancedKit
- cost: 1200
+ cost: 2000
category: cargoproduct-category-name-medical
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index f7191df9ab4..8e2e1b4df58 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -104,7 +104,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockMedicalFilled
- cost: 1750
+ cost: 3500
category: cargoproduct-category-name-medical
group: market
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 4c43596f870..6a0f0a3c23d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -32,19 +32,19 @@
- Biological
damage:
types:
- Heat: -5
- Cold: -5
- Shock: -5
- Caustic: -1.5
+ Heat: -10
+ Cold: -10
+ Shock: -10
+ Caustic: -5 #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
@@ -83,19 +83,19 @@
- Biological
damage:
types:
- Heat: -10
- Cold: -10
- Shock: -10
- Caustic: -10
+ Heat: -15
+ Cold: -15
+ Shock: -15
+ Caustic: -15 #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
@@ -123,16 +123,16 @@
- Biological
damage:
groups:
- Brute: -15 # 5 for each type in the group
+ Brute: -30 # was 5 (-15 Brute) 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
@@ -172,7 +172,7 @@
- Biological
damage:
groups:
- Brute: -30 # 10 for each type in the group
+ Brute: -45 # was 10 for each, now 20 for each type in the group, Buffed due to Limb Damage Changes
bloodlossModifier: -10 # a suture should stop ongoing bleeding
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
@@ -180,9 +180,9 @@
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
@@ -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 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
@@ -276,8 +276,8 @@
- Biological
damage:
types:
- Slash: -5
- Piercing: -10
+ Slash: -10 # Was 5
+ Piercing: -15 # Was 10, Buffed due to limb damage changes
bloodlossModifier: -10
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
@@ -285,9 +285,9 @@
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
@@ -304,7 +304,7 @@
components:
- type: Stack
lingering: true
- count: 10
+ count: 1
- type: entity
name: aloe cream
@@ -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
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 6b441711e1b..f5edc342166 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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