Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-21 13:35:26 -07:00
parent c7273c03be 869fb5e897
commit a784a74ccb
180 changed files with 4392 additions and 2132 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)