[MIRROR] Swaps sleep() to use SECONDS define [MDB IGNORE] (#16973)

* Swaps sleep() to use SECONDS define

* merge conflicts and skyrat modules

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-10-20 01:43:24 +02:00
committed by GitHub
parent 59dc5c36b7
commit 612568daa0
99 changed files with 280 additions and 279 deletions
@@ -43,7 +43,7 @@
if(!used)
loc.visible_message(span_warning("\The [src] begins to shake. Stand back!"))
used = TRUE
sleep(50)
sleep(5 SECONDS)
var/turf/deploy_location = get_turf(src)
var/status = template.check_deploy(deploy_location)
switch(status)
+12 -12
View File
@@ -85,7 +85,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
balloon2.pixel_y = 10
balloon2.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.add_overlay(balloon2)
sleep(4)
sleep(0.4 SECONDS)
balloon = mutable_appearance('icons/obj/fulton_balloon.dmi', "fulton_balloon")
balloon.pixel_y = 10
balloon.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
@@ -93,15 +93,15 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
holder_obj.add_overlay(balloon)
playsound(holder_obj.loc, 'sound/items/fultext_deploy.ogg', 50, TRUE, -3)
animate(holder_obj, pixel_z = 10, time = 20)
sleep(20)
sleep(2 SECONDS)
animate(holder_obj, pixel_z = 15, time = 10)
sleep(10)
sleep(1 SECONDS)
animate(holder_obj, pixel_z = 10, time = 10)
sleep(10)
sleep(1 SECONDS)
animate(holder_obj, pixel_z = 15, time = 10)
sleep(10)
sleep(1 SECONDS)
animate(holder_obj, pixel_z = 10, time = 10)
sleep(10)
sleep(1 SECONDS)
playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', 50, TRUE, -3)
animate(holder_obj, pixel_z = 1000, time = 30)
if(ishuman(A))
@@ -109,28 +109,28 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
L.SetUnconscious(0)
L.set_drowsyness(0)
L.SetSleeping(0)
sleep(30)
sleep(3 SECONDS)
var/list/flooring_near_beacon = list()
for(var/turf/open/floor in orange(1, beacon))
flooring_near_beacon += floor
holder_obj.forceMove(pick(flooring_near_beacon))
animate(holder_obj, pixel_z = 10, time = 50)
sleep(50)
sleep(5 SECONDS)
animate(holder_obj, pixel_z = 15, time = 10)
sleep(10)
sleep(1 SECONDS)
animate(holder_obj, pixel_z = 10, time = 10)
sleep(10)
sleep(1 SECONDS)
balloon3 = mutable_appearance('icons/obj/fulton_balloon.dmi', "fulton_retract")
balloon3.pixel_y = 10
balloon3.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
holder_obj.cut_overlay(balloon)
holder_obj.add_overlay(balloon3)
sleep(4)
sleep(0.4 SECONDS)
holder_obj.cut_overlay(balloon3)
A.set_anchored(FALSE) // An item has to be unanchored to be extracted in the first place.
A.set_density(initial(A.density))
animate(holder_obj, pixel_z = 0, time = 5)
sleep(5)
sleep(0.5 SECONDS)
A.forceMove(holder_obj.loc)
qdel(holder_obj)
if(uses_left <= 0)
@@ -182,7 +182,7 @@
new /obj/effect/temp_visual/hierophant/blast/visual(t, user, TRUE)
for(var/mob/living/L in range(1, source))
INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user)
sleep(6) //at this point the blasts detonate
sleep(0.6 SECONDS) //at this point the blasts detonate
if(beacon)
beacon.icon_state = "hierophant_tele_off"
else
@@ -199,19 +199,19 @@
if(!turf_to_teleport_to || turf_to_teleport_to.is_blocked_turf(TRUE))
return
animate(teleporting, alpha = 0, time = 2, easing = EASE_OUT) //fade out
sleep(1)
sleep(0.1 SECONDS)
if(!teleporting)
return
teleporting.visible_message(span_hierophant_warning("[teleporting] fades out!"))
sleep(2)
sleep(0.2 SECONDS)
if(!teleporting)
return
var/success = do_teleport(teleporting, turf_to_teleport_to, no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC)
sleep(1)
sleep(0.1 SECONDS)
if(!teleporting)
return
animate(teleporting, alpha = 255, time = 2, easing = EASE_IN) //fade IN
sleep(1)
sleep(0.1 SECONDS)
if(!teleporting)
return
teleporting.visible_message(span_hierophant_warning("[teleporting] fades in!"))
+2 -2
View File
@@ -331,7 +331,7 @@
new /obj/effect/temp_visual/warp_cube(get_turf(linked), user, linked.teleport_color, FALSE)
var/obj/effect/warp_cube/link_holder = new /obj/effect/warp_cube(T)
user.forceMove(link_holder) //mess around with loc so the user can't wander around
sleep(2.5)
sleep(0.25 SECONDS)
if(QDELETED(user))
qdel(link_holder)
return
@@ -340,7 +340,7 @@
qdel(link_holder)
return
link_holder.forceMove(get_turf(linked))
sleep(2.5)
sleep(0.25 SECONDS)
if(QDELETED(user))
qdel(link_holder)
return
+2 -2
View File
@@ -429,7 +429,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_[coinflip]"
playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE)
var/oldloc = loc
sleep(15)
sleep(1.5 SECONDS)
if(loc == oldloc && user && !user.incapacitated())
user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \
span_notice("You flip [src]. It lands on [coinflip]."), \
@@ -498,7 +498,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_[coinflip]"
playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE)
var/oldloc = loc
sleep(15)
sleep(1.5 SECONDS)
if(loc == oldloc && user && !user.incapacitated())
user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \
span_notice("You flip [src]. It lands on [coinflip]."), \