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

2020-03-27 21:32:40 -07:00
parent 3071dec0d6 eb84d426e1
commit c39dd52b5f
917 changed files with 182662 additions and 22716 deletions
@@ -339,7 +339,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
 	else
 		// Pass all the gas related code an empty gas container
 		removed = new()
-	damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),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)