Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888

[MIRROR] Refactors cinematics.
This commit is contained in:
LetterJay
2017-09-27 23:42:35 -04:00
committed by GitHub
11 changed files with 307 additions and 184 deletions
@@ -27,7 +27,7 @@
del_on_death = 1
/mob/living/simple_animal/cockroach/death(gibbed)
if(SSticker.cinematic) //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes.
if(SSticker.mode && SSticker.mode.station_was_nuked) //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes.
return
..()