mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
[MIRROR] Removes some simple sleeps (#11527)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
committed by
GitHub
parent
794f2649b6
commit
8d29707485
@@ -123,8 +123,7 @@
|
||||
spawn(1)
|
||||
L.visible_message(span_infoplain(span_bold("\The [L]") + " begins to fade away..."))
|
||||
animate(L, alpha = 255, alpha = 0, time = 30) // Makes them fade into nothingness.
|
||||
sleep(30)
|
||||
qdel(L)
|
||||
QDEL_IN(L, 30)
|
||||
|
||||
// Deletes all the summons and wards from the core, so that Destroy() won't have issues.
|
||||
/obj/item/technomancer_core/proc/dismiss_all_summons()
|
||||
|
||||
@@ -32,5 +32,4 @@
|
||||
|
||||
var/image/target_image = image(icon = 'icons/obj/spells.dmi', loc = get_turf(chosen_target), icon_state = "target")
|
||||
user << target_image
|
||||
sleep(5)
|
||||
qdel(target_image)
|
||||
QDEL_IN(target_image, 5)
|
||||
|
||||
@@ -239,7 +239,6 @@
|
||||
for (var/entry in internal_log)
|
||||
dat += "[entry]<br><hr>"
|
||||
//to_chat(ui.user, "Printing the log, standby...")
|
||||
//sleep(50)
|
||||
var/obj/item/paper/P = new/obj/item/paper( loc )
|
||||
P.name = "activity log"
|
||||
P.info = dat
|
||||
|
||||
@@ -817,16 +817,15 @@ About the new airlock wires panel:
|
||||
// The preceding comment was borrowed from the grille's shock script
|
||||
/obj/machinery/door/airlock/shock(mob/user, prb)
|
||||
if(!arePowerSystemsOn())
|
||||
return 0
|
||||
return FALSE
|
||||
if(hasShocked)
|
||||
return 0 //Already shocked someone recently?
|
||||
return FALSE //Already shocked someone recently?
|
||||
if(..())
|
||||
hasShocked = 1
|
||||
sleep(10)
|
||||
hasShocked = 0
|
||||
return 1
|
||||
VARSET_IN(src, hasShocked, FALSE, 1 SECOND)
|
||||
return TRUE
|
||||
else
|
||||
return 0
|
||||
return FALSE
|
||||
|
||||
|
||||
/obj/machinery/door/airlock/update_icon()
|
||||
|
||||
@@ -187,9 +187,7 @@
|
||||
if(enabled)
|
||||
if(!attacked && !emagged)
|
||||
attacked = TRUE
|
||||
spawn()
|
||||
sleep(60)
|
||||
attacked = FALSE
|
||||
VARSET_IN(src, attacked, FALSE, 6 SECONDS)
|
||||
|
||||
take_damage(damage)
|
||||
|
||||
|
||||
@@ -222,8 +222,7 @@
|
||||
animation.icon = 'icons/mob/mob.dmi'
|
||||
animation.master = user
|
||||
flick("blspell", animation)
|
||||
sleep(5)
|
||||
qdel(animation)
|
||||
QDEL_IN(animation, 5)
|
||||
|
||||
if(!flashfail)
|
||||
flick("flash2", src)
|
||||
@@ -267,8 +266,7 @@
|
||||
animation.icon = 'icons/mob/mob.dmi'
|
||||
animation.master = user
|
||||
flick("blspell", animation)
|
||||
sleep(5)
|
||||
qdel(animation)
|
||||
QDEL_IN(animation, 5)
|
||||
|
||||
for(var/mob/living/carbon/C in oviewers(3, null))
|
||||
var/safety = C.eyecheck()
|
||||
|
||||
@@ -346,9 +346,8 @@
|
||||
t1 += "[printedmessage]<BR>"
|
||||
P.info = t1
|
||||
P.name = "Transcript"
|
||||
canprint = 0
|
||||
sleep(300)
|
||||
canprint = 1
|
||||
canprint = FALSE
|
||||
VARSET_IN(src, canprint, TRUE, 30 SECONDS)
|
||||
|
||||
|
||||
/obj/item/taperecorder/attack_self(mob/user)
|
||||
|
||||
@@ -617,10 +617,8 @@
|
||||
spawn(5) //gia said so
|
||||
icon_state = "nuketoy"
|
||||
playsound(src, 'sound/machines/alarm.ogg', 10, 0, 0)
|
||||
sleep(135)
|
||||
icon_state = "nuketoycool"
|
||||
sleep(cooldown - world.time)
|
||||
icon_state = "nuketoyidle"
|
||||
VARSET_IN(src, icon_state, "nuketoycool", 135)
|
||||
VARSET_IN(src, icon_state, "nuketoyidle", (135 + (cooldown - world.time)))
|
||||
else
|
||||
var/timeleft = (cooldown - world.time)
|
||||
to_chat(user, span_warning("Nothing happens, and") + " '[round(timeleft/10)]' " + span_warning("appears on a small display."))
|
||||
@@ -796,8 +794,7 @@
|
||||
s.set_up(5, 1, src)
|
||||
s.start()
|
||||
icon_state = "shoot"
|
||||
sleep(5)
|
||||
icon_state = "[initial(icon_state)]"
|
||||
VARSET_IN(src, icon_state, "[initial(icon_state)]", 5)
|
||||
|
||||
/*
|
||||
* Toy chainsaw
|
||||
|
||||
@@ -68,7 +68,6 @@
|
||||
for(var/mob/living/L as anything in buckled_mobs)
|
||||
L.burn_skin(85)
|
||||
to_chat(L, span_danger("You feel a deep shock course through your body!"))
|
||||
sleep(1)
|
||||
L.burn_skin(85)
|
||||
L.Stun(600)
|
||||
visible_message(span_danger("The electric chair went off!"), span_danger("You hear a deep sharp shock!"))
|
||||
|
||||
@@ -112,10 +112,8 @@
|
||||
/obj/machinery/porta_turret/stumble_into(mob/living/M)
|
||||
..()
|
||||
if(!attacked && !emagged)
|
||||
attacked = 1
|
||||
spawn()
|
||||
sleep(60)
|
||||
attacked = 0
|
||||
attacked = TRUE
|
||||
VARSET_IN(src, attacked, FALSE, 6 SECONDS)
|
||||
|
||||
/obj/machinery/space_heater/stumble_into(mob/living/M)
|
||||
..()
|
||||
|
||||
@@ -84,5 +84,4 @@
|
||||
appearance = MA
|
||||
|
||||
animate(src, color = null, time = 3 SECONDS)
|
||||
sleep(3 SECONDS)
|
||||
icon_state = "origin"
|
||||
VARSET_IN(src, icon_state, "origin", 3 SECONDS)
|
||||
|
||||
Reference in New Issue
Block a user