mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-09 16:14:13 +00:00
Merge pull request #15820 from Intigracy/idontrespectyourauthoritycooldownsir
Adminghosts no longer respect poltergeist cooldowns
This commit is contained in:
@@ -327,11 +327,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
|
||||
// Check for last poltergeist activity.
|
||||
/mob/dead/observer/proc/can_poltergeist(var/start_cooldown=1)
|
||||
if(isAdminGhost(src))
|
||||
return TRUE
|
||||
if(world.time >= next_poltergeist)
|
||||
if(start_cooldown)
|
||||
start_poltergeist_cooldown()
|
||||
return 1
|
||||
return 0
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/mob/dead/observer/proc/start_poltergeist_cooldown()
|
||||
next_poltergeist=world.time + POLTERGEIST_COOLDOWN
|
||||
|
||||
@@ -56,7 +56,7 @@ var/global/list/boo_phrases_silicon=list(
|
||||
/spell/aoe_turf/boo/cast(list/targets)
|
||||
for(var/turf/T in targets)
|
||||
for(var/atom/A in T.contents)
|
||||
if(A.can_spook())
|
||||
if(A.can_spook(0))
|
||||
A.spook(holder)
|
||||
|
||||
/* FIXME
|
||||
|
||||
Reference in New Issue
Block a user