wow okay make it do this instead

2020-02-21 11:53:16 -08:00
parent 8e865a5081
commit 0f9bda8f90
1 changed files with 2 additions and 2 deletions
@@ -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