More spawn/sleep removals (#47634)

* remove more spawns

* more

* more

* varsets

* oops

* unfuck this
This commit is contained in:
spookydonut
2019-11-13 03:07:59 -08:00
committed by Rob Bailey
parent 736414a741
commit dd6fa5eded
26 changed files with 122 additions and 130 deletions
+3 -3
View File
@@ -215,9 +215,9 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
if(virgin)
fillCurrent()
virgin = 0
cooldown = 1
sleep(100) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
cooldown = 0
cooldown = TRUE
// prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10 SECONDS)
else
to_chat(user, "<span class='warning'>[src] is jammed, give it a few seconds.</span>")
..()
+8 -8
View File
@@ -86,8 +86,7 @@
c.copy_overlays(copy, TRUE)
toner--
busy = TRUE
sleep(15)
busy = FALSE
addtimer(CALLBACK(src, .proc/reset_busy), 1.5 SECONDS)
else
break
updateUsrDialog()
@@ -96,8 +95,7 @@
if(toner >= 5 && !busy && photocopy) //Was set to = 0, but if there was say 3 toner left and this ran, you would get -2 which would be weird for ink
new /obj/item/photo (loc, photocopy.picture.Copy(greytoggle == "Greyscale"? TRUE : FALSE))
busy = TRUE
sleep(15)
busy = FALSE
addtimer(CALLBACK(src, .proc/reset_busy), 1.5 SECONDS)
else
break
else if(doccopy)
@@ -106,8 +104,7 @@
new /obj/item/documents/photocopy(loc, doccopy)
toner-= 6 // the sprite shows 6 papers, yes I checked
busy = TRUE
sleep(15)
busy = FALSE
addtimer(CALLBACK(src, .proc/reset_busy), 1.5 SECONDS)
else
break
updateUsrDialog()
@@ -175,8 +172,7 @@
photo.pixel_y = rand(-10, 10)
toner -= 5 //AI prints color pictures only, thus they can do it more efficiently
busy = TRUE
sleep(15)
busy = FALSE
addtimer(CALLBACK(src, .proc/reset_busy), 1.5 SECONDS)
updateUsrDialog()
else if(href_list["colortoggle"])
if(greytoggle == "Greyscale")
@@ -185,6 +181,10 @@
greytoggle = "Greyscale"
updateUsrDialog()
/obj/machinery/photocopier/proc/reset_busy()
busy = FALSE
updateUsrDialog()
/obj/machinery/photocopier/proc/do_insertion(obj/item/O, mob/user)
O.forceMove(src)
to_chat(user, "<span class='notice'>You insert [O] into [src].</span>")