From 9569aff04e95e762434a15633e775b66d311bfde Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sun, 5 Feb 2023 16:11:50 -0800 Subject: [PATCH 01/10] damage modifier changse --- Resources/Prototypes/Damage/modifier_sets.yml | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index def757b7b3..16e6bb413b 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -94,15 +94,31 @@ flatReductions: Blunt: 5 +# - type: damageModifierSet # Old +# id: Slime +# coefficients: +# Blunt: 0.6 +# Slash: 1.2 +# Piercing: 1.2 +# Cold: 1.5 +# Poison: 0.8 +# Cellular: 0.2 - type: damageModifierSet id: Slime coefficients: - Blunt: 0.6 - Slash: 1.2 - Piercing: 1.2 - Cold: 1.5 - Poison: 0.8 + Blunt: 2.0 # Lots of blunt, if they do more than 5 damage (flatReduction) + Slash: 1.5 + Piercing: 0.5 + Cold: 1.6 + Heat: 0.4 + Poison: -1.0 # Poison modifier doesn't do anything? Cellular: 0.2 + Asphyxiation: 0.9 + Bloodloss: 1.1 + Shock: 0.4 + Radiation: 0.5 + flatReductions: + Blunt: 5.0 - type: damageModifierSet id: Infernal From 5770dc84f83ef8b9016b84c24458f9af743d5a0f Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Mon, 6 Feb 2023 18:37:59 -0800 Subject: [PATCH 02/10] s --- Resources/Prototypes/Damage/modifier_sets.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 16e6bb413b..066855195c 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -94,7 +94,7 @@ flatReductions: Blunt: 5 -# - type: damageModifierSet # Old +# - type: damageModifierSet # id: Slime # coefficients: # Blunt: 0.6 @@ -103,22 +103,23 @@ # Cold: 1.5 # Poison: 0.8 # Cellular: 0.2 + - type: damageModifierSet id: Slime coefficients: - Blunt: 2.0 # Lots of blunt, if they do more than 5 damage (flatReduction) + Blunt: 2 # Lots of blunt, if they do more than 5 damage (flatReduction) Slash: 1.5 Piercing: 0.5 Cold: 1.6 Heat: 0.4 - Poison: -1.0 # Poison modifier doesn't do anything? + Poison: -1 # Poison modifier doesn't do anything? Cellular: 0.2 Asphyxiation: 0.9 Bloodloss: 1.1 Shock: 0.4 Radiation: 0.5 flatReductions: - Blunt: 5.0 + Blunt: 5 - type: damageModifierSet id: Infernal From be8917c30e12a4612680678e41b573682ae0deb4 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sun, 4 Jun 2023 20:57:26 -0700 Subject: [PATCH 03/10] poisonous reagents do not ignore resistances --- Resources/Prototypes/Damage/modifier_sets.yml | 2 +- .../Nyanotrasen/Reagents/psionic.yml | 6 ++- .../Reagents/Consumable/Drink/alcohol.yml | 4 ++ .../Reagents/Consumable/Drink/drinks.yml | 1 + .../Reagents/Consumable/Drink/juice.yml | 1 + .../Reagents/Consumable/Drink/soda.yml | 1 + Resources/Prototypes/Reagents/botany.yml | 21 ++++++++- Resources/Prototypes/Reagents/chemicals.yml | 1 + Resources/Prototypes/Reagents/cleaning.yml | 1 + Resources/Prototypes/Reagents/elements.yml | 1 + Resources/Prototypes/Reagents/fun.yml | 10 ++++- Resources/Prototypes/Reagents/gases.yml | 1 + Resources/Prototypes/Reagents/medicine.yml | 43 +++++++++++++++++-- Resources/Prototypes/Reagents/narcotics.yml | 23 +++++++++- Resources/Prototypes/Reagents/pyrotechnic.yml | 2 + Resources/Prototypes/Reagents/toxins.yml | 9 ++++ .../SimpleStation14/Reagents/drinks.yml | 1 + 17 files changed, 118 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index b7587eee4c..25e5b63edb 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -112,7 +112,7 @@ Piercing: 0.5 Cold: 1.6 Heat: 0.4 - Poison: -1 # Poison modifier doesn't do anything? + Poison: -1 # TODO: Medicine doesn't get inverted? Cellular: 0.2 Asphyxiation: 0.9 Bloodloss: 1.1 diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml index 915f9296db..2cd86b5a99 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml @@ -29,8 +29,12 @@ Burn: -5 Brute: -4 types: - Poison: -3 Bloodloss: -3 + - !type:HealthChange + damage: + types: + Poison: -3 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: SoulbreakerToxin diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 35ef2fe0c3..4f3b042300 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -128,6 +128,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison # dwarves take less toxin damage and heal a marginal amount of brute - !type:HealthChange conditions: @@ -138,6 +139,7 @@ damage: types: Poison: 0.2 + ignoreResistances: false # Parkstation-compliantpoison - !type:HealthChange conditions: - !type:ReagentThreshold @@ -243,6 +245,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Rum @@ -1096,6 +1099,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Patron diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 73726639ab..adce6c920c 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -226,6 +226,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: SodaWater diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index 6758927ad5..258bfb0ee0 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -42,6 +42,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison #TODO: restore eyesight #if(..()) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index 0cd79f7099..ccfe56658f 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -157,6 +157,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: ShamblersJuice diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml index 60b3d0a316..14e135cb33 100644 --- a/Resources/Prototypes/Reagents/botany.yml +++ b/Resources/Prototypes/Reagents/botany.yml @@ -44,6 +44,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison conditions: - !type:OrganType type: Plant @@ -68,6 +69,7 @@ damage: types: Poison: 3 + ignoreResistances: false # Parkstation-compliantpoison conditions: - !type:OrganType type: Plant @@ -95,13 +97,20 @@ - !type:HealthChange damage: types: - Poison: -4 Blunt: 2 Slash: 1 Piercing: 1 conditions: - !type:OrganType type: Plant + - !type:HealthChange + damage: + types: + Poison: -4 + ignoreResistances: false # Parkstation-compliantpoison + conditions: + - !type:OrganType + type: Plant - type: reagent id: RobustHarvest @@ -127,13 +136,20 @@ - !type:HealthChange damage: types: - Poison: -2 Blunt: -3 Slash: -3 Piercing: -3 conditions: - !type:OrganType type: Plant + - !type:HealthChange + damage: + types: + Poison: -2 + ignoreResistances: false # Parkstation-compliantpoison + conditions: + - !type:OrganType + type: Plant - type: reagent id: WeedKiller @@ -155,6 +171,7 @@ damage: types: Poison: 4 + ignoreResistances: false # Parkstation-compliantpoison conditions: - !type:OrganType type: Plant diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml index 76273de3a0..8b791ea624 100644 --- a/Resources/Prototypes/Reagents/chemicals.yml +++ b/Resources/Prototypes/Reagents/chemicals.yml @@ -33,6 +33,7 @@ damage: types: Poison: -1 + ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCleanBloodstream cleanseRate: 3 diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index 4c98211a42..3c588552a0 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -14,6 +14,7 @@ damage: types: Poison: 3 + ignoreResistances: false # Parkstation-compliantpoison - !type:PopupMessage type: Local visualType: MediumCaution diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index f510bfce74..43d1defc5b 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -149,6 +149,7 @@ damage: types: Poison: 2 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Potassium diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 758ed5df93..1200a8e5a6 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -122,12 +122,20 @@ - !type:HealthChange damage: types: - Poison: 2 Piercing: 2 conditions: - !type:HasTag invert: true tag: Bee + - !type:HealthChange + damage: + types: + Poison: 2 + ignoreResistances: false # Parkstation-compliantpoison + conditions: + - !type:HasTag + invert: true + tag: Bee - type: reagent id: GroundBee diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index f0883eb3ba..bd8cfb72e5 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -55,6 +55,7 @@ damage: types: Poison: 3 + ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent reagent: Inaprovaline amount: -2.0 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index e30c99cbb9..7dc2cb4c0d 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -38,6 +38,7 @@ damage: types: Poison: -1 + ignoreResistances: false # Parkstation-compliantpoison # TODO overdose: vomit, dizzy effect (drunkenness?) plantMetabolism: - !type:PlantAdjustToxins @@ -120,7 +121,14 @@ damage: types: Asphyxiation: 1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 30 + damage: + types: Poison: 0.5 + ignoreResistances: false # Parkstation-compliantpoison - !type:Jitter conditions: - !type:ReagentThreshold @@ -254,10 +262,21 @@ damage: types: Asphyxiation: -3 - Poison: -0.5 groups: Brute: -0.5 Burn: -0.5 + - !type:HealthChange + conditions: + # they gotta be in crit first + - !type:MobStateCondition + mobstate: Critical + - !type:ReagentThreshold + min: 0 + max: 20 + damage: + types: + Poison: -0.5 + ignoreResistances: false # Parkstation-compliantpoison - !type:HealthChange conditions: - !type:ReagentThreshold @@ -265,7 +284,14 @@ damage: types: Asphyxiation: 1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 20 + damage: + types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent reagent: Lexorin amount: -2 @@ -429,6 +455,7 @@ damage: types: Poison: 3 + ignoreResistances: false # Parkstation-compliantpoison - !type:ChemVomit probability: 0.15 conditions: @@ -484,6 +511,7 @@ damage: types: Poison: 0.5 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: PulpedBananaPeel @@ -543,6 +571,7 @@ damage: types: Poison: -4 + ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent conditions: - !type:ReagentThreshold @@ -566,6 +595,7 @@ damage: types: Poison: 3 + ignoreResistances: false # Parkstation-compliantpoison - !type:GenericStatusEffect key: Stun time: 3.0 @@ -617,10 +647,17 @@ groups: 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 + - !type:HealthChange + conditions: + - !type:TotalDamage + max: 50 + damage: + types: + Poison: -0.5 ##Should be about what it was when it healed the toxin group + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Lipozine @@ -814,4 +851,4 @@ conditions: - !type:ReagentThreshold min: 30 - probability: 0.02 \ No newline at end of file + probability: 0.02 diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 7ae8763763..009c58e4a8 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -15,14 +15,22 @@ damage: types: Poison: 0.75 + ignoreResistances: false # Parkstation-compliantpoison - !type:HealthChange conditions: - !type:ReagentThreshold min: 30 damage: types: - Poison: 2 # this is added to the base damage of the meth. Asphyxiation: 2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 30 + damage: + types: + Poison: 2 # this is added to the base damage of the meth. + ignoreResistances: false # Parkstation-compliantpoison Narcotic: effects: - !type:MovespeedModifier @@ -69,8 +77,15 @@ min: 20 damage: types: - Poison: 2 # this is added to the base damage of the meth. Asphyxiation: 2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 20 + damage: + types: + Poison: 2 # this is added to the base damage of the meth. + ignoreResistances: false # Parkstation-compliantpoison - !type:Jitter - !type:GenericStatusEffect key: Stun @@ -116,6 +131,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - !type:GenericStatusEffect key: Stun time: 3 @@ -191,6 +207,7 @@ damage: types: Poison: 1 # You will be laying on the floor in crit in 100 seconds if you don't have antitoxin meds (Ideally this should deal twice as much damage but since nukies don't have access to stellbinin it would kill them) + ignoreResistances: false # Parkstation-compliantpoison - !type:HealthChange conditions: - !type:ReagentThreshold @@ -198,6 +215,7 @@ damage: types: Poison: 8 # TODO this should ideally kill your liver instead + ignoreResistances: false # Parkstation-compliantpoison # effectively negates stamcrits - !type:GenericStatusEffect conditions: @@ -340,6 +358,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - !type:GenericStatusEffect conditions: - !type:ReagentThreshold diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml index 33adcd27c5..c7dfa01bea 100644 --- a/Resources/Prototypes/Reagents/pyrotechnic.yml +++ b/Resources/Prototypes/Reagents/pyrotechnic.yml @@ -155,6 +155,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - !type:FlammableReaction multiplier: 0.4 @@ -175,6 +176,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - !type:FlammableReaction multiplier: 0.4 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 6e456c2ea3..786f7d8953 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -18,6 +18,7 @@ damage: types: Poison: 2 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: CarpoToxin @@ -39,6 +40,7 @@ damage: types: Poison: 4 + ignoreResistances: false # Parkstation-compliantpoison - !type:PopupMessage type: Local visualType: MediumCaution @@ -77,6 +79,7 @@ damage: types: Poison: 1.5 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Mold @@ -93,6 +96,7 @@ damage: types: Poison: 1 + ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCauseRandomDisease conditions: - !type:ReagentThreshold @@ -382,6 +386,7 @@ damage: types: Poison: 0.4 + ignoreResistances: false # Parkstation-compliantpoison - !type:ChemVomit probability: 0.04 #Scaled for time, not metabolismrate. conditions: @@ -404,6 +409,7 @@ damage: types: Poison: 6 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: VentCrud @@ -419,6 +425,7 @@ damage: types: Poison: 2 + ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCauseDisease ##Since this mostly just comes from the event you won't ingest that much causeChance: 0.6 disease: VentCough @@ -458,6 +465,7 @@ damage: types: Poison: 2 + ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent conditions: - !type:OrganType @@ -485,6 +493,7 @@ damage: types: Poison: 0.06 + ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Pax diff --git a/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml b/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml index 0809051ba6..c3319d7ab4 100644 --- a/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml +++ b/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml @@ -33,6 +33,7 @@ damage: types: Poison: 4 # Overuse and it will poison you hard + ignoreResistances: false # Parkstation-compliantpoison Medicine: metabolismRate: 0.375 effects: From e5b2f972c2546695307499e276c34895beb93f78 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sat, 14 Oct 2023 00:59:07 -0700 Subject: [PATCH 04/10] Revert "poisonous reagents do not ignore resistances" This reverts commit be8917c30e12a4612680678e41b573682ae0deb4. --- Resources/Prototypes/Damage/modifier_sets.yml | 2 +- .../Nyanotrasen/Reagents/psionic.yml | 6 +-- .../Reagents/Consumable/Drink/alcohol.yml | 4 -- .../Reagents/Consumable/Drink/drinks.yml | 1 - .../Reagents/Consumable/Drink/juice.yml | 1 - .../Reagents/Consumable/Drink/soda.yml | 1 - Resources/Prototypes/Reagents/botany.yml | 21 +-------- Resources/Prototypes/Reagents/chemicals.yml | 1 - Resources/Prototypes/Reagents/cleaning.yml | 1 - Resources/Prototypes/Reagents/elements.yml | 1 - Resources/Prototypes/Reagents/fun.yml | 10 +---- Resources/Prototypes/Reagents/gases.yml | 1 - Resources/Prototypes/Reagents/medicine.yml | 43 ++----------------- Resources/Prototypes/Reagents/narcotics.yml | 23 +--------- Resources/Prototypes/Reagents/pyrotechnic.yml | 2 - Resources/Prototypes/Reagents/toxins.yml | 9 ---- .../SimpleStation14/Reagents/drinks.yml | 1 - 17 files changed, 10 insertions(+), 118 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 25e5b63edb..b7587eee4c 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -112,7 +112,7 @@ Piercing: 0.5 Cold: 1.6 Heat: 0.4 - Poison: -1 # TODO: Medicine doesn't get inverted? + Poison: -1 # Poison modifier doesn't do anything? Cellular: 0.2 Asphyxiation: 0.9 Bloodloss: 1.1 diff --git a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml index 2cd86b5a99..915f9296db 100644 --- a/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml +++ b/Resources/Prototypes/Nyanotrasen/Reagents/psionic.yml @@ -28,13 +28,9 @@ groups: Burn: -5 Brute: -4 - types: - Bloodloss: -3 - - !type:HealthChange - damage: types: Poison: -3 - ignoreResistances: false # Parkstation-compliantpoison + Bloodloss: -3 - type: reagent id: SoulbreakerToxin diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 4f3b042300..35ef2fe0c3 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -128,7 +128,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison # dwarves take less toxin damage and heal a marginal amount of brute - !type:HealthChange conditions: @@ -139,7 +138,6 @@ damage: types: Poison: 0.2 - ignoreResistances: false # Parkstation-compliantpoison - !type:HealthChange conditions: - !type:ReagentThreshold @@ -245,7 +243,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Rum @@ -1099,7 +1096,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Patron diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index adce6c920c..73726639ab 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -226,7 +226,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: SodaWater diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml index 258bfb0ee0..6758927ad5 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/juice.yml @@ -42,7 +42,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison #TODO: restore eyesight #if(..()) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index ccfe56658f..0cd79f7099 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -157,7 +157,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: ShamblersJuice diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml index 14e135cb33..60b3d0a316 100644 --- a/Resources/Prototypes/Reagents/botany.yml +++ b/Resources/Prototypes/Reagents/botany.yml @@ -44,7 +44,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison conditions: - !type:OrganType type: Plant @@ -69,7 +68,6 @@ damage: types: Poison: 3 - ignoreResistances: false # Parkstation-compliantpoison conditions: - !type:OrganType type: Plant @@ -97,20 +95,13 @@ - !type:HealthChange damage: types: + Poison: -4 Blunt: 2 Slash: 1 Piercing: 1 conditions: - !type:OrganType type: Plant - - !type:HealthChange - damage: - types: - Poison: -4 - ignoreResistances: false # Parkstation-compliantpoison - conditions: - - !type:OrganType - type: Plant - type: reagent id: RobustHarvest @@ -136,20 +127,13 @@ - !type:HealthChange damage: types: + Poison: -2 Blunt: -3 Slash: -3 Piercing: -3 conditions: - !type:OrganType type: Plant - - !type:HealthChange - damage: - types: - Poison: -2 - ignoreResistances: false # Parkstation-compliantpoison - conditions: - - !type:OrganType - type: Plant - type: reagent id: WeedKiller @@ -171,7 +155,6 @@ damage: types: Poison: 4 - ignoreResistances: false # Parkstation-compliantpoison conditions: - !type:OrganType type: Plant diff --git a/Resources/Prototypes/Reagents/chemicals.yml b/Resources/Prototypes/Reagents/chemicals.yml index 8b791ea624..76273de3a0 100644 --- a/Resources/Prototypes/Reagents/chemicals.yml +++ b/Resources/Prototypes/Reagents/chemicals.yml @@ -33,7 +33,6 @@ damage: types: Poison: -1 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCleanBloodstream cleanseRate: 3 diff --git a/Resources/Prototypes/Reagents/cleaning.yml b/Resources/Prototypes/Reagents/cleaning.yml index 3c588552a0..4c98211a42 100644 --- a/Resources/Prototypes/Reagents/cleaning.yml +++ b/Resources/Prototypes/Reagents/cleaning.yml @@ -14,7 +14,6 @@ damage: types: Poison: 3 - ignoreResistances: false # Parkstation-compliantpoison - !type:PopupMessage type: Local visualType: MediumCaution diff --git a/Resources/Prototypes/Reagents/elements.yml b/Resources/Prototypes/Reagents/elements.yml index 43d1defc5b..f510bfce74 100644 --- a/Resources/Prototypes/Reagents/elements.yml +++ b/Resources/Prototypes/Reagents/elements.yml @@ -149,7 +149,6 @@ damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Potassium diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 1200a8e5a6..758ed5df93 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -119,19 +119,11 @@ - !type:ReagentThreshold min: 0.01 reagent: Fiber - - !type:HealthChange - damage: - types: - Piercing: 2 - conditions: - - !type:HasTag - invert: true - tag: Bee - !type:HealthChange damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison + Piercing: 2 conditions: - !type:HasTag invert: true diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index bd8cfb72e5..f0883eb3ba 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -55,7 +55,6 @@ damage: types: Poison: 3 - ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent reagent: Inaprovaline amount: -2.0 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 7dc2cb4c0d..e30c99cbb9 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -38,7 +38,6 @@ damage: types: Poison: -1 - ignoreResistances: false # Parkstation-compliantpoison # TODO overdose: vomit, dizzy effect (drunkenness?) plantMetabolism: - !type:PlantAdjustToxins @@ -121,14 +120,7 @@ damage: types: Asphyxiation: 1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 30 - damage: - types: Poison: 0.5 - ignoreResistances: false # Parkstation-compliantpoison - !type:Jitter conditions: - !type:ReagentThreshold @@ -262,21 +254,10 @@ damage: types: Asphyxiation: -3 + Poison: -0.5 groups: Brute: -0.5 Burn: -0.5 - - !type:HealthChange - conditions: - # they gotta be in crit first - - !type:MobStateCondition - mobstate: Critical - - !type:ReagentThreshold - min: 0 - max: 20 - damage: - types: - Poison: -0.5 - ignoreResistances: false # Parkstation-compliantpoison - !type:HealthChange conditions: - !type:ReagentThreshold @@ -284,14 +265,7 @@ damage: types: Asphyxiation: 1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 20 - damage: - types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent reagent: Lexorin amount: -2 @@ -455,7 +429,6 @@ damage: types: Poison: 3 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemVomit probability: 0.15 conditions: @@ -511,7 +484,6 @@ damage: types: Poison: 0.5 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: PulpedBananaPeel @@ -571,7 +543,6 @@ damage: types: Poison: -4 - ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent conditions: - !type:ReagentThreshold @@ -595,7 +566,6 @@ damage: types: Poison: 3 - ignoreResistances: false # Parkstation-compliantpoison - !type:GenericStatusEffect key: Stun time: 3.0 @@ -647,17 +617,10 @@ groups: 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 - - !type:HealthChange - conditions: - - !type:TotalDamage - max: 50 - damage: - types: - Poison: -0.5 ##Should be about what it was when it healed the toxin group - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Lipozine @@ -851,4 +814,4 @@ conditions: - !type:ReagentThreshold min: 30 - probability: 0.02 + probability: 0.02 \ No newline at end of file diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index 009c58e4a8..7ae8763763 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -15,14 +15,6 @@ damage: types: Poison: 0.75 - ignoreResistances: false # Parkstation-compliantpoison - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 30 - damage: - types: - Asphyxiation: 2 - !type:HealthChange conditions: - !type:ReagentThreshold @@ -30,7 +22,7 @@ damage: types: Poison: 2 # this is added to the base damage of the meth. - ignoreResistances: false # Parkstation-compliantpoison + Asphyxiation: 2 Narcotic: effects: - !type:MovespeedModifier @@ -71,13 +63,6 @@ - !type:MovespeedModifier walkSpeedModifier: 1.25 sprintSpeedModifier: 1.25 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 20 - damage: - types: - Asphyxiation: 2 - !type:HealthChange conditions: - !type:ReagentThreshold @@ -85,7 +70,7 @@ damage: types: Poison: 2 # this is added to the base damage of the meth. - ignoreResistances: false # Parkstation-compliantpoison + Asphyxiation: 2 - !type:Jitter - !type:GenericStatusEffect key: Stun @@ -131,7 +116,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:GenericStatusEffect key: Stun time: 3 @@ -207,7 +191,6 @@ damage: types: Poison: 1 # You will be laying on the floor in crit in 100 seconds if you don't have antitoxin meds (Ideally this should deal twice as much damage but since nukies don't have access to stellbinin it would kill them) - ignoreResistances: false # Parkstation-compliantpoison - !type:HealthChange conditions: - !type:ReagentThreshold @@ -215,7 +198,6 @@ damage: types: Poison: 8 # TODO this should ideally kill your liver instead - ignoreResistances: false # Parkstation-compliantpoison # effectively negates stamcrits - !type:GenericStatusEffect conditions: @@ -358,7 +340,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:GenericStatusEffect conditions: - !type:ReagentThreshold diff --git a/Resources/Prototypes/Reagents/pyrotechnic.yml b/Resources/Prototypes/Reagents/pyrotechnic.yml index c7dfa01bea..33adcd27c5 100644 --- a/Resources/Prototypes/Reagents/pyrotechnic.yml +++ b/Resources/Prototypes/Reagents/pyrotechnic.yml @@ -155,7 +155,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:FlammableReaction multiplier: 0.4 @@ -176,7 +175,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:FlammableReaction multiplier: 0.4 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 786f7d8953..6e456c2ea3 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -18,7 +18,6 @@ damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: CarpoToxin @@ -40,7 +39,6 @@ damage: types: Poison: 4 - ignoreResistances: false # Parkstation-compliantpoison - !type:PopupMessage type: Local visualType: MediumCaution @@ -79,7 +77,6 @@ damage: types: Poison: 1.5 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Mold @@ -96,7 +93,6 @@ damage: types: Poison: 1 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCauseRandomDisease conditions: - !type:ReagentThreshold @@ -386,7 +382,6 @@ damage: types: Poison: 0.4 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemVomit probability: 0.04 #Scaled for time, not metabolismrate. conditions: @@ -409,7 +404,6 @@ damage: types: Poison: 6 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: VentCrud @@ -425,7 +419,6 @@ damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison - !type:ChemCauseDisease ##Since this mostly just comes from the event you won't ingest that much causeChance: 0.6 disease: VentCough @@ -465,7 +458,6 @@ damage: types: Poison: 2 - ignoreResistances: false # Parkstation-compliantpoison - !type:AdjustReagent conditions: - !type:OrganType @@ -493,7 +485,6 @@ damage: types: Poison: 0.06 - ignoreResistances: false # Parkstation-compliantpoison - type: reagent id: Pax diff --git a/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml b/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml index c3319d7ab4..0809051ba6 100644 --- a/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml +++ b/Resources/Prototypes/SimpleStation14/Reagents/drinks.yml @@ -33,7 +33,6 @@ damage: types: Poison: 4 # Overuse and it will poison you hard - ignoreResistances: false # Parkstation-compliantpoison Medicine: metabolismRate: 0.375 effects: From 53b25be578f4413c76a3b21835e45df0cdd512ce Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sat, 14 Oct 2023 16:16:44 -0700 Subject: [PATCH 05/10] ReagentDamageModifierSystem --- .../Chemistry/ReagentEffects/HealthChange.cs | 11 ++++- .../ReagentDamageModifierComponent.cs | 14 ++++++ .../Damage/Events/DamageEvents.cs | 16 +++++++ .../Systems/ReagentDamageModifierSystem.cs | 46 +++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 Content.Shared/SimpleStation14/Damage/Components/ReagentDamageModifierComponent.cs create mode 100644 Content.Shared/SimpleStation14/Damage/Events/DamageEvents.cs create mode 100644 Content.Shared/SimpleStation14/Damage/Systems/ReagentDamageModifierSystem.cs diff --git a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs index 2da455b780..54945d92ad 100644 --- a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs +++ b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs @@ -5,6 +5,8 @@ using Content.Shared.Damage.Prototypes; using Content.Shared.FixedPoint; using Content.Shared.Localizations; +using Content.Shared.SimpleStation14.Damage.Events; +using Content.Shared.SimpleStation14.Damage.Systems; using JetBrains.Annotations; using Robust.Shared.Prototypes; @@ -112,10 +114,17 @@ protected override string ReagentEffectGuidebookText(IPrototypeManager prototype public override void Effect(ReagentEffectArgs args) { + // Parkstation-ReagentDamageModifiers Start + var damage = Damage; + + damage = args.EntityManager.System().ModifyDamage(args.SolutionEntity, damage); + var scale = ScaleByQuantity ? args.Quantity * 2 : FixedPoint2.New(1); // Parkstation-fixReagentSuperPotency scale *= args.Scale; + damage *= scale; - args.EntityManager.System().TryChangeDamage(args.SolutionEntity, Damage * scale, IgnoreResistances); + args.EntityManager.System().TryChangeDamage(args.SolutionEntity, damage, IgnoreResistances); + // Parkstation-ReagentDamageModifiers End } } } diff --git a/Content.Shared/SimpleStation14/Damage/Components/ReagentDamageModifierComponent.cs b/Content.Shared/SimpleStation14/Damage/Components/ReagentDamageModifierComponent.cs new file mode 100644 index 0000000000..bb0dfa2243 --- /dev/null +++ b/Content.Shared/SimpleStation14/Damage/Components/ReagentDamageModifierComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared.Damage.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.SimpleStation14.Damage.Components; + +[RegisterComponent] +public sealed class ReagentDamageModifierComponent : Component +{ + /// + /// Modifier set prototype to use for reagent damages + /// + [DataField("modifierSet", customTypeSerializer: typeof(PrototypeIdSerializer), required: true)] + public string ModifierSet = ""; +} diff --git a/Content.Shared/SimpleStation14/Damage/Events/DamageEvents.cs b/Content.Shared/SimpleStation14/Damage/Events/DamageEvents.cs new file mode 100644 index 0000000000..047903e9fd --- /dev/null +++ b/Content.Shared/SimpleStation14/Damage/Events/DamageEvents.cs @@ -0,0 +1,16 @@ +using Content.Shared.Damage; + +namespace Content.Shared.SimpleStation14.Damage.Events; + +[ByRefEvent] +public sealed class ReagentDamageModifyEvent : EntityEventArgs +{ + public readonly DamageSpecifier OriginalDamage; + public DamageSpecifier Damage; + + public ReagentDamageModifyEvent(DamageSpecifier damage) + { + OriginalDamage = damage; + Damage = damage; + } +} diff --git a/Content.Shared/SimpleStation14/Damage/Systems/ReagentDamageModifierSystem.cs b/Content.Shared/SimpleStation14/Damage/Systems/ReagentDamageModifierSystem.cs new file mode 100644 index 0000000000..a1fd017d74 --- /dev/null +++ b/Content.Shared/SimpleStation14/Damage/Systems/ReagentDamageModifierSystem.cs @@ -0,0 +1,46 @@ +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.FixedPoint; +using Content.Shared.SimpleStation14.Damage.Events; +using Content.Shared.SimpleStation14.Damage.Components; +using Robust.Shared.Prototypes; + +namespace Content.Shared.SimpleStation14.Damage.Systems; + +public sealed class ReagentDamageModifierSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _prototype = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnReagentDamage); + } + + + /// + /// Applies a modifier set from the component to the reagent damage + /// + private void OnReagentDamage(EntityUid uid, ReagentDamageModifierComponent component, ref ReagentDamageModifyEvent args) + { + if (_prototype.TryIndex(component.ModifierSet, out var modifier)) + { + args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modifier); + } + } + + + /// + /// Sends an event requesting reagent damage modifications since the HealthChange reagent effect can't send events + /// + /// Entity to raise the event on + /// Damage to be taken for modification + /// Modified damage set + public DamageSpecifier ModifyDamage(EntityUid uid, DamageSpecifier originalDamage) + { + var ev = new ReagentDamageModifyEvent(originalDamage); + RaiseLocalEvent(uid, ref ev); + return ev.Damage; + } +} From 883092a9a177b2738862aee804524252f65e98b7 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sat, 14 Oct 2023 16:17:15 -0700 Subject: [PATCH 06/10] invert Poison for slimepeople --- Resources/Prototypes/Damage/modifier_sets.yml | 10 ---------- Resources/Prototypes/Entities/Mobs/Species/slime.yml | 2 ++ .../SimpleStation14/Damage/modifier_sets.yml | 5 +++++ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 5b9e03d496..e73c104b4c 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -106,16 +106,6 @@ flatReductions: Blunt: 5 -# - type: damageModifierSet -# id: Slime -# coefficients: -# Blunt: 0.6 -# Slash: 1.2 -# Piercing: 1.2 -# Cold: 1.5 -# Poison: 0.8 -# Cellular: 0.2 - - type: damageModifierSet id: Slime coefficients: diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 829ba7f008..3e0b309b74 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -77,6 +77,8 @@ naturalImmunities: - Ultragigacancer - BleedersBite + - type: ReagentDamageModifier + modifierSet: SlimeReagents - type: entity save: false diff --git a/Resources/Prototypes/SimpleStation14/Damage/modifier_sets.yml b/Resources/Prototypes/SimpleStation14/Damage/modifier_sets.yml index 4df72522d3..e2e33d315b 100644 --- a/Resources/Prototypes/SimpleStation14/Damage/modifier_sets.yml +++ b/Resources/Prototypes/SimpleStation14/Damage/modifier_sets.yml @@ -31,3 +31,8 @@ Shock: 1.25 Radiation: 1.3 +- type: damageModifierSet + id: SlimeReagents + coefficients: + Poison: -1 + minimumDamageToDamage: -999 From ba1e9db1bc2553ccdfe486344d34edf24bad8104 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Date: Sat, 14 Oct 2023 16:25:14 -0700 Subject: [PATCH 07/10] Update modifier_sets.yml --- Resources/Prototypes/Damage/modifier_sets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index e73c104b4c..97b72dc285 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -109,12 +109,12 @@ - type: damageModifierSet id: Slime coefficients: - Blunt: 2 # Lots of blunt, if they do more than 5 damage (flatReduction) + Blunt: 2 # Lots of blunt, if they do more than 5 damage Slash: 1.5 Piercing: 0.5 Cold: 1.6 Heat: 0.4 - Poison: -1 # Poison modifier doesn't do anything? + Poison: -1 Cellular: 0.2 Asphyxiation: 0.9 Bloodloss: 1.1 From e7e8208f79c065d9dc076116bc0795a0e5a7931b Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sat, 14 Oct 2023 16:51:32 -0700 Subject: [PATCH 08/10] make guidebook accurate (die in cold, live in hot) --- Resources/Prototypes/Entities/Mobs/Species/slime.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 3e0b309b74..016eb7ade3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -79,6 +79,16 @@ - BleedersBite - type: ReagentDamageModifier modifierSet: SlimeReagents + - type: Temperature + heatDamageThreshold: 422 + coldDamageThreshold: 285 + currentTemperature: 320 + coldDamage: + types: + Cold : 0.3 + heatDamage: + types: + Heat : 0.1 - type: entity save: false From 66e7a345dd63038a4088b9a788887376adfc56e4 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sat, 14 Oct 2023 17:02:19 -0700 Subject: [PATCH 09/10] update guidebook entry --- .../Guidebook/Species/WizdenSpecies/Slime.xml | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml b/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml index a42400b541..87e1c798de 100644 --- a/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml +++ b/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml @@ -9,19 +9,28 @@ Slimes are sentient beings made from jelly that commonly appear as humans to ble ## Ability Differences -- Slimes have jelly instead of blood, which is toxic to other species when consumed. -- Slimes are incapable of living in cold environments, dying very quickly. -- To contrast, Slimes are able to survive longer in hot environments. -- Take less brute damage. -- Take more slash damage. -- Breathe Nitrogen instead of Oxygen. +- Have jelly instead of blood, which is toxic to other species when consumed +- Incapable of living in cold environments, dying very quickly +- Able to live in warmer environments +- Breathe Nitrogen instead of Oxygen +- Poison damage is inverted +- Take twice the blunt damage if more than 5 +- Take more slash damage +- Take half piercing damage +- Take more cold damage +- Take much less heat damage +- Take much less cellular damage +- Take a little less asphyxiation damage +- Take a little more bloodloss damage +- Take much less shock damage +- Take much less radiation damage ## Physical Differences -- Slimes are slightly transparent. -- Can have any color of skin. -- Have several additional marking options. -- Have different voices (screams/laughs). -- Can "Squish" (emote). -- Can be Genderless. +- Slightly transparent +- Can have any color of skin +- Several additional marking options +- Different voices (screams/laughs) +- Can "Squish" (emote) +- Can be genderless From 0fd42762b72ad8d4359bafa2b459897211b98fb8 Mon Sep 17 00:00:00 2001 From: DEATHB4DEFEAT Date: Sat, 14 Oct 2023 18:15:50 -0700 Subject: [PATCH 10/10] update blunt reduction and guidebook --- Resources/Prototypes/Damage/modifier_sets.yml | 2 +- .../SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 97b72dc285..1c60b674b1 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -121,7 +121,7 @@ Shock: 0.4 Radiation: 0.5 flatReductions: - Blunt: 5 + Blunt: 4.5 - type: damageModifierSet id: Infernal diff --git a/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml b/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml index 87e1c798de..820e8b0a19 100644 --- a/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml +++ b/Resources/ServerInfo/SimpleStation14/Guidebook/Species/WizdenSpecies/Slime.xml @@ -14,7 +14,7 @@ Slimes are sentient beings made from jelly that commonly appear as humans to ble - Able to live in warmer environments - Breathe Nitrogen instead of Oxygen - Poison damage is inverted -- Take twice the blunt damage if more than 5 +- Minor blunt damages are without effect, but strong damages are singificantly more effective - Take more slash damage - Take half piercing damage - Take more cold damage