Merge pull request #8825 from Ghommie/Ghommie-cit110

Ports "Fixes default supplypods exploding their contents" & co.
2019-07-07 02:34:47 -07:00
parent 91f114f717 b41e289db3
commit e227d5575c
7 changed files with 31 additions and 11 deletions
@@ -69,6 +69,9 @@
 /mob/living/silicon/contents_explosion(severity, target)
 	return

+/mob/living/silicon/prevent_content_explosion()
+	return TRUE
+
 /mob/living/silicon/proc/cancelAlarm()
 	return

@@ -41,6 +41,9 @@
 	QDEL_NULL(internal)
 	. = ..()

+/mob/living/simple_animal/hostile/megafauna/prevent_content_explosion()
+	return TRUE
+
 /mob/living/simple_animal/hostile/megafauna/death(gibbed)
 	if(health > 0)
 		return