From 8e865a508180d5a3107e7c071368e29c8cc8c535 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 21 Feb 2020 11:37:17 -0800 Subject: [PATCH 1/2] Made power increase with raw damage. --- code/modules/power/supermatter/supermatter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 21003b5e86..52a836e717 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -345,7 +345,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) else // Pass all the gas related code an empty gas container removed = new() - + matter_power += damage - damage_archived damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage) // hardcap any direct damage taken before doing atmos damage damage_archived = damage if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process From 0f9bda8f909c1e99ec827bc798add26f4d1f3fc1 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 21 Feb 2020 11:53:16 -0800 Subject: [PATCH 2/2] wow okay make it do this instead --- code/modules/power/supermatter/supermatter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 52a836e717..858adc0d66 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -345,9 +345,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) else // Pass all the gas related code an empty gas container removed = new() + damage_archived = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage) matter_power += damage - damage_archived - damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage) // hardcap any direct damage taken before doing atmos damage - damage_archived = damage + damage = damage_archived if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process if(takes_damage) damage += max((power / 1000) * DAMAGE_INCREASE_MULTIPLIER, 0.1) // always does at least some damage