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

View File

@@ -298,7 +298,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/Stat()
..()
if(statpanel("Status"))
if(SSticker && SSticker.mode)
if(SSticker.HasRoundStarted())
for(var/datum/gang/G in SSticker.mode.gangs)
if(G.is_dominating)
stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
@@ -361,7 +361,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!A.hidden)
filtered += A
var/area/thearea = input("Area to jump to", "BOOYEA") as null|anything in filtered
if(!thearea)
return

View File

@@ -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)

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")

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

View File

@@ -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
..()

View File

@@ -326,7 +326,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return 0
/proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this.
if(!SSticker || !SSticker.mode)
if(!SSticker.HasRoundStarted())
return 0
if(!istype(M))
return 0