Merge pull request #11146 from Putnam3145/supermatter-hardcap

Hardcaps supermatter damage from ballistics and similar
2020-02-20 11:08:14 +01:00
parent ad337901e2 2834994587
commit e9d0f536de
1 changed files with 1 additions and 0 deletions
@@ -346,6 +346,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 		// Pass all the gas related code an empty gas container
 		removed = new()

+	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
 		if(takes_damage)