Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted

This commit is contained in:
CitadelStationBot
2017-05-01 07:24:45 -05:00
parent fc9e2a46d6
commit 7a4f1496e9
18 changed files with 45 additions and 31 deletions
@@ -0,0 +1,10 @@
diff a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm (rejected hunks)
@@ -32,7 +32,7 @@
dna.species.spec_death(gibbed, src)
- if(SSticker && SSticker.mode)
+ if(SSticker.HasRoundStarted())
SSblackbox.ReportDeath(src)
if(mind && mind.devilinfo)
INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src)
+1 -1
View File
@@ -600,7 +600,7 @@
return name
/mob/living/update_gravity(has_gravity,override = 0)
if(!SSticker || !SSticker.mode)
if(!SSticker.HasRoundStarted())
return
if(has_gravity)
clear_alert("weightless")
+1 -1
View File
@@ -172,7 +172,7 @@
/mob/living/attack_slime(mob/living/simple_animal/slime/M)
if(!SSticker || !SSticker.mode)
if(!SSticker.HasRoundStarted())
to_chat(M, "You cannot attack people before the game has started.")
return
@@ -6,7 +6,7 @@
/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M)
if(!SSticker || !SSticker.mode)
if(!SSticker.HasRoundStarted())
to_chat(M, "You cannot attack people before the game has started.")
return
..()