mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 12:05:59 +01:00
Fixes ghosts' boo ability going on cooldown when the light they tried to flicker didn't flick (#62965)
This commit is contained in:
@@ -174,8 +174,7 @@
|
||||
step(src, dir)
|
||||
if(65 to 70)
|
||||
var/obj/machinery/light/L = locate(/obj/machinery/light) in view(4, src)
|
||||
if(L)
|
||||
L.flicker()
|
||||
L?.flicker()
|
||||
if(62 to 64)
|
||||
playsound(loc,pick('sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg'), 50, TRUE, ignore_walls = FALSE)
|
||||
if(61)
|
||||
|
||||
@@ -346,6 +346,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller)
|
||||
message_admins("[key_name_admin(holder)] broke all lights")
|
||||
for(var/obj/machinery/light/L in GLOB.machines)
|
||||
L.break_light_tube()
|
||||
stoplag()
|
||||
if("whiteout")
|
||||
if(!is_funmin)
|
||||
return
|
||||
@@ -353,6 +354,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller)
|
||||
message_admins("[key_name_admin(holder)] fixed all lights")
|
||||
for(var/obj/machinery/light/L in GLOB.machines)
|
||||
L.fix()
|
||||
stoplag()
|
||||
if("customportal")
|
||||
if(!is_funmin)
|
||||
return
|
||||
|
||||
@@ -27,8 +27,9 @@
|
||||
M.Paralyze(rand(100,200))
|
||||
|
||||
for(var/obj/machinery/light/L in range(4, user))
|
||||
L.on = 1
|
||||
L.on = TRUE
|
||||
L.break_light_tube()
|
||||
stoplag()
|
||||
return TRUE
|
||||
|
||||
/datum/action/changeling/dissonant_shriek
|
||||
@@ -40,8 +41,10 @@
|
||||
|
||||
/datum/action/changeling/dissonant_shriek/sting_action(mob/user)
|
||||
..()
|
||||
for(var/obj/machinery/light/L in range(5, usr))
|
||||
L.on = 1
|
||||
L.break_light_tube()
|
||||
empulse(get_turf(user), 2, 5, 1)
|
||||
for(var/obj/machinery/light/L in range(5, usr))
|
||||
L.on = TRUE
|
||||
L.break_light_tube()
|
||||
stoplag()
|
||||
|
||||
return TRUE
|
||||
|
||||
@@ -567,12 +567,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
|
||||
if(bootime > world.time)
|
||||
return
|
||||
var/obj/machinery/light/L = locate(/obj/machinery/light) in view(1, src)
|
||||
if(L)
|
||||
L.flicker()
|
||||
if(L?.flicker())
|
||||
bootime = world.time + 600
|
||||
return
|
||||
//Maybe in the future we can add more <i>spooky</i> code here!
|
||||
return
|
||||
|
||||
|
||||
/mob/dead/observer/verb/toggle_ghostsee()
|
||||
set name = "Toggle Ghost Vision"
|
||||
|
||||
@@ -1497,7 +1497,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, APC_PIXEL_OFFSET
|
||||
for(var/obj/machinery/light/L in area)
|
||||
L.on = TRUE
|
||||
L.break_light_tube()
|
||||
L.on = FALSE
|
||||
stoplag()
|
||||
|
||||
/obj/machinery/power/apc/proc/shock(mob/user, prb)
|
||||
|
||||
@@ -414,6 +414,7 @@
|
||||
sleep(rand(5, 15))
|
||||
on = (status == LIGHT_OK)
|
||||
update(FALSE)
|
||||
. = TRUE //did we actually flicker?
|
||||
flickering = FALSE
|
||||
|
||||
// ai attack - make lights flicker, because why not
|
||||
|
||||
@@ -187,7 +187,6 @@ Burning extracts:
|
||||
for(var/obj/machinery/light/L in A) //Shamelessly copied from the APC effect.
|
||||
L.on = TRUE
|
||||
L.break_light_tube()
|
||||
L.on = FALSE
|
||||
stoplag()
|
||||
..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user