diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index 4bb18a98e878..bb50fdf4f295 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -80,15 +80,15 @@
//Actual combat defines
-//click cooldowns, in tenths of a second, used for various combat actions
-#define CLICK_CD_MELEE 8
-#define CLICK_CD_RANGE 4
-#define CLICK_CD_RAPID 2
-#define CLICK_CD_CLICK_ABILITY 6
-#define CLICK_CD_BREAKOUT 100
-#define CLICK_CD_HANDCUFFED 10
-#define CLICK_CD_RESIST 20
-#define CLICK_CD_GRABBING 10
+//click cooldowns, in seconds, used for various combat actions
+#define CLICK_CD_MELEE 0.8 SECONDS
+#define CLICK_CD_RANGE 0.4 SECONDS
+#define CLICK_CD_RAPID 0.2 SECONDS
+#define CLICK_CD_CLICK_ABILITY 0.6 SECONDS
+#define CLICK_CD_BREAKOUT 10 SECONDS
+#define CLICK_CD_HANDCUFFED 1 SECONDS
+#define CLICK_CD_RESIST 2 SECONDS
+#define CLICK_CD_GRABBING 1 SECONDS
//Cuff resist speeds
#define FAST_CUFFBREAK 1
diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm
index 1b2de258d3db..ff2c5f6827d7 100644
--- a/code/__DEFINES/shuttles.dm
+++ b/code/__DEFINES/shuttles.dm
@@ -44,8 +44,8 @@
#define SHUTTLE_TRANSIT_BORDER 8
-#define PARALLAX_LOOP_TIME 25
-#define HYPERSPACE_END_TIME 5
+#define PARALLAX_LOOP_TIME 2.5 SECONDS
+#define HYPERSPACE_END_TIME 0.5 SECONDS
#define HYPERSPACE_WARMUP 1
#define HYPERSPACE_LAUNCH 2
diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm
index 4c38e4a05c40..ab87a94d1fc9 100644
--- a/code/__HELPERS/matrices.dm
+++ b/code/__HELPERS/matrices.dm
@@ -2,7 +2,7 @@
. = new_angle - old_angle
Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
-/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
+/atom/proc/SpinAnimation(speed = 1 SECONDS, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
if(!segments)
return
var/segment = 360/segments
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index aa7974700fd8..eb839be8a17a 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -565,7 +565,7 @@ GLOBAL_LIST_EMPTY(species_list)
return
AM.setDir(i)
callperrotate?.Invoke()
- sleep(1)
+ sleep(0.1 SECONDS)
if(set_original_dir)
AM.setDir(originaldir)
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 2e2a8b9313b2..1af237c7c06c 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -233,7 +233,7 @@
toggle_all_ctf()
- sleep(50)
+ sleep(5 SECONDS)
ready_for_reboot = TRUE
standard_reboot()
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 60fa4c7e62a2..47ed6b720d77 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1223,7 +1223,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
#undef DELTA_CALC
-/proc/flash_color(mob_or_client, flash_color="#960000", flash_time=20)
+/proc/flash_color(mob_or_client, flash_color="#960000", flash_time=2 SECONDS)
var/client/C
if(ismob(mob_or_client))
var/mob/M = mob_or_client
@@ -1255,7 +1255,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
var/initialpixely = pixel_y
var/shiftx = rand(-pixelshiftx,pixelshiftx)
var/shifty = rand(-pixelshifty,pixelshifty)
- animate(src, pixel_x = pixel_x + shiftx, pixel_y = pixel_y + shifty, time = 0.2, loop = duration)
+ animate(src, pixel_x = pixel_x + shiftx, pixel_y = pixel_y + shifty, time = 0.02 SECONDS, loop = duration)
pixel_x = initialpixelx
pixel_y = initialpixely
diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index 4bed9d06daee..7d6c955072e2 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -63,7 +63,7 @@
SEND_SOUND(usr, get_sfx("terminal_type"))
transform = turn(matrix() * 0.9, pick(-8, 8))
alpha = 200
- animate(src, transform = matrix(), time=4, alpha=255)
+ animate(src, transform = matrix(), time=0.4 SECONDS, alpha=255)
return TRUE
//Hide/Show Action Buttons ... Button
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 95dda12cb3ce..33387eefa146 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -62,7 +62,7 @@
if(client && hud_used)
hud_used.reorganize_alerts()
thealert.transform = matrix(32, 6, MATRIX_TRANSLATE)
- animate(thealert, transform = matrix(), time = 2.5, easing = CUBIC_EASING)
+ animate(thealert, transform = matrix(), time = 0.25 SECONDS, easing = CUBIC_EASING)
if(thealert.timeout)
addtimer(CALLBACK(src, .proc/alert_timeout, thealert, category), thealert.timeout)
@@ -378,7 +378,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
if(sac_objective && !sac_objective.check_completion())
if(icon_state == "runed_sense0")
return
- animate(src, transform = null, time = 1, loop = 0)
+ animate(src, transform = null, time = 0.1 SECONDS, loop = 0)
angle = 0
cut_overlays()
icon_state = "runed_sense0"
@@ -391,7 +391,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
desc = "The sacrifice is complete, summon Nar-Sie! The summoning can only take place in [english_list(summon_objective.summon_spots)]!"
if(icon_state == "runed_sense1")
return
- animate(src, transform = null, time = 1, loop = 0)
+ animate(src, transform = null, time = 0.1 SECONDS, loop = 0)
angle = 0
cut_overlays()
icon_state = "runed_sense1"
@@ -440,7 +440,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
return
var/matrix/final = matrix(transform)
final.Turn(difference)
- animate(src, transform = final, time = 5, loop = 0)
+ animate(src, transform = final, time = 0.5 SECONDS, loop = 0)
diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm
index c199210e3b87..a3ab1c4aa297 100644
--- a/code/_onclick/hud/credits.dm
+++ b/code/_onclick/hud/credits.dm
@@ -1,7 +1,7 @@
-#define CREDIT_ROLL_SPEED 60
-#define CREDIT_SPAWN_SPEED 4
+#define CREDIT_ROLL_SPEED 6 SECONDS
+#define CREDIT_SPAWN_SPEED 0.4 SECONDS
#define CREDIT_ANIMATE_HEIGHT (16 * world.icon_size) //13 would cause credits to get stacked at the top of the screen, so we let them go past the top edge
-#define CREDIT_EASE_DURATION 12
+#define CREDIT_EASE_DURATION 1.2 SECONDS
GLOBAL_LIST(end_titles)
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index cf0b79b853ef..aa711265c308 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -20,7 +20,7 @@
return screen
-/mob/proc/clear_fullscreen(category, animated = 10)
+/mob/proc/clear_fullscreen(category, animated = 1 SECONDS)
var/obj/screen/fullscreen/screen = screens[category]
if(!screen)
return
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index 702c5dfe1072..87ab8c3ec536 100755
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -167,7 +167,7 @@
L.transform = newtransform
- animate(L, transform = L.transform, time = 0, loop = -1, flags = ANIMATION_END_NOW)
+ animate(L, transform = L.transform, time = 0 SECONDS, loop = -1, flags = ANIMATION_END_NOW)
animate(transform = matrix(), time = T)
/datum/hud/proc/update_parallax()
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 6b47705e4057..26af2be2459c 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -715,10 +715,10 @@
if(QDELETED(src))
return
if(out)
- animate(src, alpha = 0, time = 30)
+ animate(src, alpha = 0, time = 3 SECONDS)
else
alpha = 0
- animate(src, alpha = 255, time = 30)
+ animate(src, alpha = 255, time = 3 SECONDS)
if(qdel_after)
QDEL_IN(src, 30)
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 7bac3bbe50cf..dd2c7cf3f115 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -223,7 +223,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if(sleep_offline_after_initializations)
world.sleep_offline = TRUE
- sleep(1)
+ sleep(0.1 SECONDS)
if(sleep_offline_after_initializations && CONFIG_GET(flag/resume_after_initializations))
world.sleep_offline = FALSE
@@ -320,7 +320,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/starting_tick_usage = TICK_USAGE
if (processing <= 0)
current_ticklimit = TICK_LIMIT_RUNNING
- sleep(10)
+ sleep(1 SECONDS)
continue
//Anti-tick-contention heuristics:
@@ -375,7 +375,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
iteration++
error_level++
current_ticklimit = TICK_LIMIT_RUNNING
- sleep(10)
+ sleep(1 SECONDS)
continue
if (queue_head)
@@ -387,7 +387,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
iteration++
error_level++
current_ticklimit = TICK_LIMIT_RUNNING
- sleep(10)
+ sleep(1 SECONDS)
continue
error_level--
if (!queue_head) //reset the counts if the queue is empty, in the off chance they get out of sync
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 4a236e9456c1..d0de6312dba6 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -724,7 +724,7 @@ SUBSYSTEM_DEF(job)
/datum/controller/subsystem/job/Recover()
set waitfor = FALSE
var/oldjobs = SSjob.occupations
- sleep(20)
+ sleep(2 SECONDS)
for (var/datum/job/J in oldjobs)
INVOKE_ASYNC(src, .proc/RecoverJob, J)
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index 818db502cc03..2b96c596cf09 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -34,7 +34,7 @@
var/is_global = FALSE //Global cinematics will override mob-specific ones
var/obj/screen/cinematic/screen
var/datum/callback/special_callback //For special effects synced with animation (explosions after the countdown etc)
- var/cleanup_time = 300 //How long for the final screen to remain
+ var/cleanup_time = 30 SECONDS //How long for the final screen to remain
var/stop_ooc = TRUE //Turns off ooc when played globally.
/datum/cinematic/New()
@@ -117,7 +117,7 @@
//Actual cinematic goes in here
/datum/cinematic/proc/content()
- sleep(50)
+ sleep(5 SECONDS)
/datum/cinematic/proc/replacement_cinematic(datum/source, datum/cinematic/other)
if(!is_global && other.is_global) //Allow it to play if we're local and it's global
@@ -129,7 +129,7 @@
/datum/cinematic/nuke_win/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
flick("station_explode_fade_red",screen)
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
special()
@@ -140,7 +140,7 @@
/datum/cinematic/nuke_miss/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
special()
flick("station_intact_fade_red",screen)
@@ -152,7 +152,7 @@
/datum/cinematic/nuke_selfdestruct/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
flick("station_explode_fade_red", screen)
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
special()
@@ -163,7 +163,7 @@
/datum/cinematic/nuke_selfdestruct_miss/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
special()
screen.icon_state = "station_intact"
@@ -173,7 +173,7 @@
/datum/cinematic/malf/content()
flick("intro_malf",screen)
- sleep(76)
+ sleep(7.6 SECONDS)
flick("station_explode_fade_red",screen)
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
special()
@@ -185,14 +185,14 @@
/datum/cinematic/cult/content()
screen.icon_state = null
flick("intro_cult",screen)
- sleep(25)
+ sleep(2.5 SECONDS)
cinematic_sound(sound('sound/magic/enter_blood.ogg'))
- sleep(28)
+ sleep(2.8 SECONDS)
cinematic_sound(sound('sound/machines/terminal_off.ogg'))
- sleep(20)
+ sleep(2 SECONDS)
flick("station_corrupted",screen)
cinematic_sound(sound('sound/effects/ghost.ogg'))
- sleep(70)
+ sleep(7 SECONDS)
special()
/datum/cinematic/cult_nuke
@@ -200,7 +200,7 @@
/datum/cinematic/cult_nuke/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
flick("station_explode_fade_red",screen)
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
special()
@@ -211,7 +211,7 @@
/datum/cinematic/nuke_annihilation/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
flick("station_explode_fade_red",screen)
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
special()
@@ -219,29 +219,29 @@
/datum/cinematic/fake
id = CINEMATIC_NUKE_FAKE
- cleanup_time = 100
+ cleanup_time = 10 SECONDS
/datum/cinematic/fake/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
cinematic_sound(sound('sound/items/bikehorn.ogg'))
flick("summary_selfdes",screen) //???
special()
/datum/cinematic/no_core
id = CINEMATIC_NUKE_NO_CORE
- cleanup_time = 100
+ cleanup_time = 10 SECONDS
/datum/cinematic/no_core/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
flick("station_intact",screen)
cinematic_sound(sound('sound/ambience/signal.ogg'))
- sleep(100)
+ sleep(10 SECONDS)
/datum/cinematic/nuke_far
id = CINEMATIC_NUKE_FAR
- cleanup_time = 0
+ cleanup_time = 0 SECONDS
/datum/cinematic/nuke_far/content()
cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
@@ -249,11 +249,11 @@
/datum/cinematic/clownop
id = CINEMATIC_NUKE_CLOWNOP
- cleanup_time = 100
+ cleanup_time = 10 SECONDS
/datum/cinematic/clownop/content()
flick("intro_nuke",screen)
- sleep(35)
+ sleep(3.5 SECONDS)
cinematic_sound(sound('sound/items/airhorn.ogg'))
flick("summary_selfdes",screen) //???
special()
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index 016e54286e49..cd1dc1fd6573 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -116,13 +116,13 @@
var/oldtransform = AM.transform
var/oldcolor = AM.color
var/oldalpha = AM.alpha
- animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10)
+ animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 1 SECONDS)
for(var/i in 1 to 5)
//Make sure the item is still there after our sleep
if(!AM || QDELETED(AM))
return
AM.pixel_y--
- sleep(2)
+ sleep(0.2 SECONDS)
//Make sure the item is still there after our sleep
if(!AM || QDELETED(AM))
diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm
index 8f5e5f46d3ae..70a19bc5262d 100644
--- a/code/datums/components/radioactive.dm
+++ b/code/datums/components/radioactive.dm
@@ -53,8 +53,8 @@
/datum/component/radioactive/proc/glow_loop(atom/movable/master)
var/filter = master.get_filter("rad_glow")
if(filter)
- animate(filter, alpha = 110, time = 15, loop = -1)
- animate(alpha = 40, time = 25)
+ animate(filter, alpha = 110, time = 1.5 SECONDS, loop = -1)
+ animate(alpha = 40, time = 2.5 SECONDS)
/datum/component/radioactive/InheritComponent(datum/component/C, i_am_original, list/arguments)
if(!i_am_original)
diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm
index 3818126c0eb7..1c197ed75b79 100644
--- a/code/datums/components/swarming.dm
+++ b/code/datums/components/swarming.dm
@@ -35,10 +35,10 @@
var/atom/movable/owner = parent
if(!is_swarming)
is_swarming = TRUE
- animate(owner, pixel_x = owner.pixel_x + offset_x, pixel_y = owner.pixel_y + offset_y, time = 2)
+ animate(owner, pixel_x = owner.pixel_x + offset_x, pixel_y = owner.pixel_y + offset_y, time = 0.2 SECONDS)
/datum/component/swarming/proc/unswarm()
var/atom/movable/owner = parent
if(is_swarming)
- animate(owner, pixel_x = owner.pixel_x - offset_x, pixel_y = owner.pixel_y - offset_y, time = 2)
+ animate(owner, pixel_x = owner.pixel_x - offset_x, pixel_y = owner.pixel_y - offset_y, time = 0.2 SECONDS)
is_swarming = FALSE
diff --git a/code/datums/components/waddling.dm b/code/datums/components/waddling.dm
index 2c42a4c01d6a..b637e60498d4 100644
--- a/code/datums/components/waddling.dm
+++ b/code/datums/components/waddling.dm
@@ -11,6 +11,6 @@
if(L.incapacitated() || !(L.mobility_flags & MOBILITY_STAND))
return
var/cached_transform = L.transform
- animate(L, pixel_z = 4, time = 0)
- animate(pixel_z = 0, transform = turn(cached_transform, pick(-12, 0, 12)), time=2)
- animate(pixel_z = 0, transform = cached_transform, time = 0)
+ animate(L, pixel_z = 4, time = 0 SECONDS)
+ animate(pixel_z = 0, transform = turn(cached_transform, pick(-12, 0, 12)), time=0.2 SECONDS)
+ animate(pixel_z = 0, transform = cached_transform, time = 0 SECONDS)
diff --git a/code/datums/martial/flying_fang.dm b/code/datums/martial/flying_fang.dm
index 07d745e89ede..9aa3f4d175ee 100644
--- a/code/datums/martial/flying_fang.dm
+++ b/code/datums/martial/flying_fang.dm
@@ -224,7 +224,7 @@
L.Immobilize(6 SECONDS)
A.SetKnockdown(0)
A.SetImmobilized(10 SECONDS) //due to our stun resistance this is actually about 6.6 seconds
- sleep(2)//Runtime prevention (infinite bump() calls on hulks)
+ sleep(0.2 SECONDS)//Runtime prevention (infinite bump() calls on hulks)
step_towards(src,L)
else if(hit_atom.density && !hit_atom.CanPass(A))
A.visible_message("[A] smashes into [hit_atom]!", "You smash into [hit_atom]!")
diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm
index 6082aa553c52..2f9f1c61a88a 100644
--- a/code/datums/martial/plasma_fist.dm
+++ b/code/datums/martial/plasma_fist.dm
@@ -30,7 +30,7 @@
break
A.setDir(i)
playsound(A.loc, 'sound/weapons/punch1.ogg', 15, 1, -1)
- sleep(1)
+ sleep(0.1 SECONDS)
/datum/martial_art/plasma_fist/proc/Tornado(mob/living/carbon/human/A, mob/living/carbon/human/D)
A.say("TORNADO SWEEP!", forced="plasma fist")
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index 974f33790182..ae6cb041137a 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -199,10 +199,10 @@
/datum/martial_art/wrestling/proc/FlipAnimation(mob/living/carbon/human/D)
set waitfor = FALSE
if (D)
- animate(D, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
- sleep(15)
+ animate(D, transform = matrix(180, MATRIX_ROTATE), time = 0.1 SECONDS, loop = 0)
+ sleep(1.5 SECONDS)
if (D)
- animate(D, transform = null, time = 1, loop = 0)
+ animate(D, transform = null, time = 0.1 SECONDS, loop = 0)
/datum/martial_art/wrestling/proc/slam(mob/living/carbon/human/A, mob/living/carbon/human/D)
if(!D)
@@ -259,7 +259,7 @@
D.pixel_y = 0
return 0
- sleep(1)
+ sleep(0.1 SECONDS)
if (A && D)
A.pixel_x = 0
@@ -376,7 +376,7 @@
A.visible_message("[A] climbs onto [surface]!")
A.pixel_y = 10
falling = 1
- sleep(10)
+ sleep(1 SECONDS)
if (A && D)
// These are necessary because of the sleep call.
@@ -396,10 +396,10 @@
return 0
if(A)
- animate(A, transform = matrix(90, MATRIX_ROTATE), time = 1, loop = 0)
- sleep(10)
+ animate(A, transform = matrix(90, MATRIX_ROTATE), time = 0.1 SECONDS, loop = 0)
+ sleep(1 SECONDS)
if(A)
- animate(A, transform = null, time = 1, loop = 0)
+ animate(A, transform = null, time = 0.1 SECONDS, loop = 0)
A.forceMove(D.loc)
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index 7a53282d2b40..fd5e0bcd4f47 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -146,8 +146,8 @@
var/y_offset_old = owner.pixel_y
var/x_offset = owner.pixel_x + rand(-2,2)
var/y_offset = owner.pixel_y + rand(-1,1)
- animate(owner, pixel_x = x_offset, pixel_y = y_offset, time = 1)
- animate(owner, pixel_x = x_offset_old, pixel_y = y_offset_old, time = 1)
+ animate(owner, pixel_x = x_offset, pixel_y = y_offset, time = 0.1 SECONDS)
+ animate(owner, pixel_x = x_offset_old, pixel_y = y_offset_old, time = 0.1 SECONDS)
//Deafness makes you deaf.
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 58ed3a7b4c0e..e9b5a3e0bdcb 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -129,8 +129,8 @@
owner.fully_heal()
owner.add_stun_absorption("inathneq", 150, 2, "'s flickering blue aura momentarily intensifies!", "Inath-neq's power absorbs the stun!", " glowing with a flickering blue light!")
owner.status_flags |= GODMODE
- animate(owner, color = oldcolor, time = 150, easing = EASE_IN)
- addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), 150)
+ animate(owner, color = oldcolor, time = 15 SECONDS, easing = EASE_IN)
+ addtimer(CALLBACK(owner, /atom/proc/update_atom_colour), 15 SECONDS)
playsound(owner, 'sound/magic/ethereal_enter.ogg', 50, 1)
return ..()
@@ -306,7 +306,7 @@
/datum/status_effect/sword_spin
id = "Bastard Sword Spin"
- duration = 50
+ duration = 5 SECONDS
tick_interval = 8
alert_type = null
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 16292d53a452..4699b1df96d9 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -560,7 +560,7 @@
wasting_effect.setDir(owner.dir)
wasting_effect.transform = owner.transform //if the owner has been stunned the overlay should inherit that position
wasting_effect.alpha = 255
- animate(wasting_effect, alpha = 0, time = 32)
+ animate(wasting_effect, alpha = 0, time = 3.2 SECONDS)
playsound(owner, 'sound/effects/curse5.ogg', 20, 1, -1)
owner.adjustFireLoss(0.75)
if(effect_last_activation <= world.time)
diff --git a/code/datums/voice_announcements.dm b/code/datums/voice_announcements.dm
index 3da5d982c8e8..9b26eff03eac 100644
--- a/code/datums/voice_announcements.dm
+++ b/code/datums/voice_announcements.dm
@@ -69,7 +69,7 @@ GLOBAL_LIST_EMPTY(voice_announce_list)
var/turf/T = get_turf(M)
if(T.z == z_level)
SEND_SOUND(M, sound2)
- sleep(30)
+ sleep(3 SECONDS)
if(canceled)
return
// Play for everyone else
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 98c4410e2f70..924197813fc9 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -790,8 +790,8 @@
else if(direction & WEST)
pixel_x_diff = -8
- animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
- animate(src, pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, time = 2)
+ animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 0.2 SECONDS)
+ animate(src, pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, time = 0.2 SECONDS)
/atom/movable/proc/do_item_attack_animation(atom/A, visual_effect_icon, obj/item/used_item)
var/image/I
@@ -831,7 +831,7 @@
if(ismob(src) && ismob(A) && (!used_item))
var/mob/M = src
t_color = M.a_intent == INTENT_HARM ? "#ff0000" : "#ffffff"
- animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3, color = t_color) //yogs end
+ animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 0.3 SECONDS, color = t_color) //yogs end
/atom/movable/vv_get_dropdown()
. = ..()
@@ -852,12 +852,12 @@
if(throwing)
return
if(on && !(movement_type & FLOATING))
- animate(src, pixel_y = pixel_y + 2, time = 10, loop = -1)
- sleep(10)
- animate(src, pixel_y = pixel_y - 2, time = 10, loop = -1)
+ animate(src, pixel_y = pixel_y + 2, time = 1 SECONDS, loop = -1)
+ sleep(1 SECONDS)
+ animate(src, pixel_y = pixel_y - 2, time = 1 SECONDS, loop = -1)
setMovetype(movement_type | FLOATING)
else if (!on && (movement_type & FLOATING))
- animate(src, pixel_y = initial(pixel_y), time = 10)
+ animate(src, pixel_y = initial(pixel_y), time = 1 SECONDS)
setMovetype(movement_type & ~FLOATING)
/* Language procs
@@ -987,6 +987,6 @@
flick_overlay(I, GLOB.clients, 6)
var/matrix/M = new
M.Turn(pick(-30, 30))
- animate(I, alpha = 175, pixel_x = to_x, pixel_y = to_y, time = 3, transform = M, easing = CUBIC_EASING)
- sleep(1)
- animate(I, alpha = 0, transform = matrix(), time = 1)
+ animate(I, alpha = 175, pixel_x = to_x, pixel_y = to_y, time = 0.3 SECONDS, transform = M, easing = CUBIC_EASING)
+ sleep(0.1 SECONDS)
+ animate(I, alpha = 0, transform = matrix(), time = 0.1 SECONDS)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 0bc0ce22ce7d..cd6c70f3ef56 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -202,7 +202,7 @@
. = 1
- sleep(rand(600,1800))
+ sleep(rand(1 MINUTES, 3 MINUTES))
if(!SSticker.IsRoundInProgress())
message_admins("Roundtype conversion cancelled, the game appears to have finished!")
round_converted = 0
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index 5970e0577bac..83ee9915e3a2 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -33,7 +33,7 @@
locked = FALSE
update_icon()
- sleep(2)
+ sleep(0.2 SECONDS)
open(1)
locked = TRUE
@@ -44,7 +44,7 @@
close(1)
locked = TRUE
- sleep(2)
+ sleep(0.2 SECONDS)
update_icon()
send_status()
@@ -161,4 +161,4 @@
/obj/machinery/airlock_sensor/Destroy()
SSradio.remove_object(src,frequency)
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 0b69224d12f1..0976aba838e4 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -103,7 +103,7 @@
tracking = 0
return
else
- sleep(10)
+ sleep(1 SECONDS)
continue
else
@@ -118,7 +118,7 @@
U.cameraFollow = null
return
- sleep(10)
+ sleep(1 SECONDS)
/proc/near_camera(mob/living/M)
if (!isturf(M.loc))
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index a16db0ca56ab..90fc5b0afe02 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -540,8 +540,8 @@ GLOBAL_VAR_INIT(clones, 0)
/obj/machinery/clonepod/proc/horrifyingsound()
for(var/i in 1 to 5)
playsound(src,pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 100, rand(0.95,1.05))
- sleep(1)
- sleep(10)
+ sleep(0.1 SECONDS)
+ sleep(1 SECONDS)
playsound(src,'sound/hallucinations/wail.ogg', 100, TRUE)
/obj/machinery/clonepod/deconstruct(disassembled = TRUE)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 53b2fd38f4f9..36fc457651b9 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(turtle > 0)
turtle--
- sleep(10)
+ sleep(1 SECONDS)
enemy_hp -= attackamt
arcade_action(usr)
@@ -221,7 +221,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
updateUsrDialog()
turtle++
- sleep(10)
+ sleep(1 SECONDS)
player_mp -= pointamt
player_hp += healamt
blocked = TRUE
@@ -238,7 +238,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
turtle--
updateUsrDialog()
- sleep(10)
+ sleep(1 SECONDS)
arcade_action(usr)
if (href_list["close"])
@@ -296,7 +296,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if (player_mp <= 0)
gameover = TRUE
- sleep(10)
+ sleep(1 SECONDS)
temp = "You have been drained! GAME OVER"
playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10)
if(obj_flags & EMAGGED)
@@ -561,7 +561,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
if(severity >= 3) //you didn't pray hard enough
to_chat(M, span_warning("An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit."))
M.Stun(100)
- sleep(30)
+ sleep(3 SECONDS)
M.vomit(10, distance = 5)
if(ORION_TRAIL_FLUX)
if(prob(75))
@@ -579,7 +579,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
F.ScrapeAway()
say("Something slams into the floor around [src], exposing it to space!")
if(hull)
- sleep(10)
+ sleep(1 SECONDS)
say("A new floor suddenly appears around [src]. What the hell?")
playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
var/turf/open/space/T
@@ -596,7 +596,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
food = rand(10,80) / rand(1,2)
fuel = rand(10,60) / rand(1,2)
if(electronics)
- sleep(10)
+ sleep(1 SECONDS)
if(oldfuel > fuel && oldfood > food)
audible_message(span_danger("[src] lets out a somehow reassuring chime."))
else if(oldfuel < fuel || oldfood < food)
@@ -1127,13 +1127,13 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
visible_message(span_notice("[src] softly beeps and whirs to life!"))
playsound(loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1)
say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.")
- sleep(20)
+ sleep(2 SECONDS)
visible_message(span_warning("[src] begins to vibrate..."))
say("Uh, Port? Having some issues with our reactor, could you check it out? Over.")
- sleep(30)
+ sleep(3 SECONDS)
say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 25, 1)
- sleep(3.6)
+ sleep(0.36 SECONDS)
visible_message(span_userdanger("[src] explodes!"))
explosion(loc, 2,4,8, flame_range = 16)
qdel(src)
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index ab008783b7f9..06360f6fb772 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -515,7 +515,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
if ("print")
if (!( printing ))
printing = 1
- sleep(50)
+ sleep(5 SECONDS)
var/obj/item/paper/P = new /obj/item/paper( loc )
var/t1 = "Crew Manifest:
"
for(var/datum/data/record/t in sortRecord(GLOB.data_core.general))
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 424a45ec2353..988c6af30393 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -503,7 +503,7 @@
src.printing = 1
GLOB.data_core.medicalPrintCount++
playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1)
- sleep(30)
+ sleep(3 SECONDS)
var/obj/item/paper/P = new /obj/item/paper( src.loc )
P.info = "Medical Record - (MR-[GLOB.data_core.medicalPrintCount])
"
if(active1 in GLOB.data_core.general)
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 42ce0d6da944..2ae0af10c293 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -28,13 +28,13 @@
if(M.id == id)
M.open()
- sleep(20)
+ sleep(2 SECONDS)
for(var/obj/machinery/mass_driver/M in range(range, src))
if(M.id == id)
M.power = connected.power
M.drive()
- sleep(50)
+ sleep(5 SECONDS)
for(var/obj/machinery/door/poddoor/M in range(range, src))
if(M.id == id)
M.close()
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 35371540b512..abc907cc0861 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -245,7 +245,7 @@
/obj/machinery/jukebox/disco/proc/hierofunk()
for(var/i in 1 to 10)
spawn_atom_to_turf(/obj/effect/temp_visual/hierophant/telegraph/edge, src, 1, FALSE)
- sleep(5)
+ sleep(0.5 SECONDS)
#define DISCO_INFENO_RANGE (rand(85, 115)*0.01)
@@ -266,9 +266,9 @@
if(25)
S.pixel_y = 7
S.forceMove(get_turf(src))
- sleep(7)
+ sleep(0.7 SECONDS)
if(selection.song_name == "Engineering's Ultimate High-Energy Hustle")
- sleep(280)
+ sleep(28 SECONDS)
for(var/obj/reveal in sparkles)
reveal.alpha = 255
while(active)
@@ -340,7 +340,7 @@
/obj/machinery/jukebox/disco/proc/dance2(mob/living/M)
for(var/i in 0 to 9)
dance_rotate(M, CALLBACK(M, /mob.proc/dance_flip))
- sleep(20)
+ sleep(2 SECONDS)
/mob/proc/dance_flip()
if(dir == WEST)
@@ -355,46 +355,46 @@
if (1 to 15)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,1)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (16 to 30)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(1,-1)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (31 to 45)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(-1,-1)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (46 to 60)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(-1,1)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (61 to 75)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(1,0)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
M.setDir(turn(M.dir, 90))
switch (M.dir)
if (NORTH)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,3)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (SOUTH)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,-3)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (EAST)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(3,0)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (WEST)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(-3,0)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
- sleep(1)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
+ sleep(0.1 SECONDS)
M.lying_fix()
/obj/machinery/jukebox/disco/proc/dance4(var/mob/living/M)
- animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
+ animate(M, transform = matrix(180, MATRIX_ROTATE), time = 0.1 SECONDS, loop = 0)
var/matrix/initial_matrix = matrix(M.transform)
for (var/i in 1 to 60)
if (!M)
@@ -402,34 +402,34 @@
if (i<31)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,1)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (i>30)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,-1)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
M.setDir(turn(M.dir, 90))
switch (M.dir)
if (NORTH)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,3)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (SOUTH)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(0,-3)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (EAST)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(3,0)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
if (WEST)
initial_matrix = matrix(M.transform)
initial_matrix.Translate(-3,0)
- animate(M, transform = initial_matrix, time = 1, loop = 0)
- sleep(1)
+ animate(M, transform = initial_matrix, time = 0.1 SECONDS, loop = 0)
+ sleep(0.1 SECONDS)
M.lying_fix()
/mob/living/proc/lying_fix()
- animate(src, transform = null, time = 1, loop = 0)
+ animate(src, transform = null, time = 0.1 SECONDS, loop = 0)
lying_prev = 0
/obj/machinery/jukebox/proc/dance_over()
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 67e48d32754f..9659e3558252 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -527,7 +527,7 @@
/obj/machinery/door/airlock/proc/handlePowerRestore()
var/cont = TRUE
while (cont)
- sleep(10)
+ sleep(1 SECONDS)
if(QDELETED(src))
return
cont = FALSE
@@ -641,7 +641,7 @@
part.transform = T
if(AIRLOCK_CLOSING)
part.transform = T
- animate(part, transform = T, time = 5 - part.move_end_time, flags = ANIMATION_LINEAR_TRANSFORM)
+ animate(part, transform = T, time = 0.5 SECONDS - part.move_end_time, flags = ANIMATION_LINEAR_TRANSFORM)
animate(transform = matrix(), time = part.move_end_time - part.move_start_time, flags = ANIMATION_LINEAR_TRANSFORM)
if(AIRLOCK_OPENING)
part.transform = matrix()
@@ -658,7 +658,7 @@
if(AIRLOCK_CLOSING)
part.pixel_x = part.open_px
part.pixel_y = part.open_py
- animate(part, pixel_x = part.open_px, pixel_y = part.open_py, time = 5 - part.move_end_time)
+ animate(part, pixel_x = part.open_px, pixel_y = part.open_py, time = 0.5 SECONDS - part.move_end_time)
animate(pixel_x = 0, pixel_y = 0, time = part.move_end_time - part.move_start_time)
if(AIRLOCK_OPENING)
part.pixel_x = 0
@@ -763,7 +763,7 @@
if(!stat)
update_icon(AIRLOCK_DENY)
playsound(src,doorDeni,50,0,3)
- sleep(6)
+ sleep(0.6 SECONDS)
update_icon(AIRLOCK_CLOSED)
/obj/machinery/door/airlock/examine(mob/user)
@@ -830,7 +830,7 @@
if(!aiHacking)
aiHacking = TRUE
to_chat(user, "Airlock AI control has been blocked. Beginning fault-detection.")
- sleep(50)
+ sleep(5 SECONDS)
if(canAIControl(user))
to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.")
aiHacking = FALSE
@@ -840,9 +840,9 @@
aiHacking = FALSE
return
to_chat(user, "Fault confirmed: airlock control wire disabled or cut.")
- sleep(20)
+ sleep(2 SECONDS)
to_chat(user, "Attempting to hack into airlock. This may take some time.")
- sleep(200)
+ sleep(20 SECONDS)
if(canAIControl(user))
to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.")
aiHacking = FALSE
@@ -852,7 +852,7 @@
aiHacking = FALSE
return
to_chat(user, "Upload access confirmed. Loading control program into airlock software.")
- sleep(170)
+ sleep(17 SECONDS)
if(canAIControl(user))
to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.")
aiHacking = FALSE
@@ -862,11 +862,11 @@
aiHacking = FALSE
return
to_chat(user, "Transfer complete. Forcing airlock to execute program.")
- sleep(50)
+ sleep(5 SECONDS)
//disable blocked control
aiControlDisabled = AI_WIRE_HACKED
to_chat(user, "Receiving control information from airlock.")
- sleep(10)
+ sleep(1 SECONDS)
//bring up airlock dialog
aiHacking = FALSE
if(user)
@@ -913,7 +913,7 @@
/obj/machinery/door/airlock/proc/electrified_loop()
while (secondsElectrified > MACHINE_NOT_ELECTRIFIED)
- sleep(10)
+ sleep(1 SECONDS)
if(QDELETED(src))
return
@@ -1358,14 +1358,14 @@
welded = !welded
operating = TRUE
update_icon(AIRLOCK_OPENING, 1)
- sleep(1)
+ sleep(0.1 SECONDS)
set_opacity(0)
update_freelook_sight()
- sleep(1)
+ sleep(0.1 SECONDS)
density = FALSE
- sleep(3)
+ sleep(0.3 SECONDS)
air_update_turf(1)
- sleep(1)
+ sleep(0.1 SECONDS)
layer = OPEN_DOOR_LAYER
update_icon(AIRLOCK_OPEN, 1)
operating = FALSE
@@ -1407,17 +1407,17 @@
if(air_tight)
density = TRUE
air_update_turf(1)
- sleep(1)
+ sleep(0.1 SECONDS)
density = TRUE
if(!air_tight)
air_update_turf(1)
- sleep(4)
+ sleep(0.4 SECONDS)
if(!safe)
crush()
if(visible && !glass)
set_opacity(1)
update_freelook_sight()
- sleep(1)
+ sleep(0.1 SECONDS)
update_icon(AIRLOCK_CLOSED, 1)
operating = FALSE
delayed_close_requested = FALSE
@@ -1469,7 +1469,7 @@
if(!operating && density && hasPower() && !(obj_flags & EMAGGED))
operating = TRUE
update_icon(AIRLOCK_EMAG, 1)
- sleep(6)
+ sleep(0.6 SECONDS)
if(QDELETED(src))
return
operating = FALSE
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 7f97715b624d..7284d76aaef4 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -600,8 +600,8 @@
if(src)
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/obj/machinery/door/airlock/clockwork/attackby(obj/item/I, mob/living/user, params)
if(!attempt_construction(I, user))
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 317fc0a666b2..0688a16a63fa 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -316,9 +316,9 @@
operating = TRUE
do_animate("opening")
set_opacity(0)
- sleep(5)
+ sleep(0.5 SECONDS)
density = FALSE
- sleep(5)
+ sleep(0.5 SECONDS)
layer = initial(layer)
update_icon()
set_opacity(0)
@@ -348,9 +348,9 @@
layer = closingLayer
if(air_tight)
density = TRUE
- sleep(5)
+ sleep(0.5 SECONDS)
density = TRUE
- sleep(5)
+ sleep(0.5 SECONDS)
update_icon()
if(visible && !glass)
set_opacity(1)
@@ -365,7 +365,7 @@
/obj/machinery/door/proc/CheckForMobs()
if(locate(/mob/living) in get_turf(src))
- sleep(1)
+ sleep(0.1 SECONDS)
open()
/obj/machinery/door/proc/crush()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index aabd5ec0265f..6f28785e0b4f 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -60,9 +60,9 @@
return
autoclose = TRUE
if(check_access(null))
- sleep(50)
+ sleep(5 SECONDS)
else //secure doors close faster
- sleep(20)
+ sleep(2 SECONDS)
if(!density && autoclose) //did someone change state while we slept?
close()
@@ -150,7 +150,7 @@
do_animate("opening")
playsound(src, 'sound/machines/windowdoor.ogg', 100, 1)
icon_state ="[base_state]open"
- sleep(10)
+ sleep(1 SECONDS)
density = FALSE
air_update_turf(1)
@@ -177,7 +177,7 @@
density = TRUE
air_update_turf(1)
update_freelook_sight()
- sleep(10)
+ sleep(1 SECONDS)
operating = FALSE
return 1
@@ -217,7 +217,7 @@
operating = TRUE
flick("[base_state]spark", src)
playsound(src, "sparks", 75, 1)
- sleep(6)
+ sleep(0.6 SECONDS)
operating = FALSE
desc += "
[span_warning("Its access panel is smoking slightly.")]"
open(2)
@@ -421,7 +421,7 @@
if(src)
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
/obj/machinery/door/window/clockwork/allowed(mob/M)
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 5df66cc392ac..86b0e4b41db7 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -548,7 +548,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
newangle += 360
var/matrix/M = matrix()
if (get_dist(get_turf(holo),new_turf) <= 1)
- animate(ray, transform = turn(M.Scale(1,sqrt(distx*distx+disty*disty)),newangle),time = 1)
+ animate(ray, transform = turn(M.Scale(1,sqrt(distx*distx+disty*disty)),newangle),time = 0.1 SECONDS)
else
ray.transform = turn(M.Scale(1,sqrt(distx*distx+disty*disty)),newangle)
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index edc946ed3751..0110312e5634 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -187,7 +187,7 @@
electricity_level = 1
use_power(electricity_level * 5)
- sleep(13 - electricity_level)
+ sleep((1.3 SECONDS) - electricity_level)
magneting = FALSE
@@ -372,9 +372,9 @@
speed = 1
if(speed == 10)
- sleep(1)
+ sleep(0.1 SECONDS)
else
- sleep(12-speed)
+ sleep((1.2 SECONDS)-speed)
looping = 0
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index d8cb030b2b23..1276560e6752 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -183,7 +183,7 @@ Buildable meters
C.vomit(0, TRUE, FALSE, 4, FALSE)
if(prob(20))
C.spew_organ()
- sleep(5)
+ sleep(0.5 SECONDS)
C.blood_volume = 0
return(OXYLOSS|BRUTELOSS)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index f8c08ba24739..200ea939bb4f 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -287,7 +287,7 @@
controllock = TRUE
on = FALSE //turns off the turret temporarily
update_icon()
- sleep(60) //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
+ sleep(6 SECONDS) //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
on = TRUE //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index f08849dd26c3..d9f234bee669 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -212,7 +212,7 @@
while(working)
randomize_reels()
updateDialog()
- sleep(2)
+ sleep(0.2 SECONDS)
spawn(SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len)) //WARNING: no sanity checking for user since it's not needed and would complicate things (machine should still spin even if user is gone), be wary of this if you're changing this code.
toggle_reel_spin(0, REEL_DEACTIVATE_DELAY)
diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm
index 1314f2869547..d0251a19f527 100644
--- a/code/game/machinery/stasis.dm
+++ b/code/game/machinery/stasis.dm
@@ -74,7 +74,7 @@
if(mattress_on.alpha ? !_running : _running) //check the inverse of _running compared to truthy alpha, to see if they differ
var/new_alpha = _running ? 255 : 0
var/easing_direction = _running ? EASE_OUT : EASE_IN
- animate(mattress_on, alpha = new_alpha, time = 50, easing = CUBIC_EASING|easing_direction)
+ animate(mattress_on, alpha = new_alpha, time = 5 SECONDS, easing = CUBIC_EASING|easing_direction)
overlays_to_remove = managed_vis_overlays - mattress_on
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 4abc4289c485..99709e429a1b 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -155,7 +155,7 @@
var/width = 4 * marqee_length
var/time = (width + 32) * SCROLL_RATE
animate(src, maptext_x = -width, time = time, loop = -1)
- animate(maptext_x = 32, time = 0)
+ animate(maptext_x = 32, time = 0 SECONDS)
else
// Centered text
maptext = generate_text(line, center = TRUE)
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 768793b418df..cd23443fbecf 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -323,7 +323,7 @@
attempts++
defusals++
holder.loc.visible_message(span_notice("[icon2html(holder, viewers(holder))] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires in 5 seconds..."))
- sleep(50) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out
+ sleep(5 SECONDS) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out
if(istype(holder))
reset()
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index a791e4bd3611..ed2da527f876 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -88,7 +88,7 @@
H.adjustBruteLoss(max(0, 80 - H.getBruteLoss())) // Hurt the human, don't try to kill them though.
// Sleep for a couple of ticks to allow the human to see the pain
- sleep(5)
+ sleep(0.5 SECONDS)
use_power(5000) // Use a lot of power.
var/mob/living/silicon/robot/R = H.Robotize()
@@ -104,7 +104,7 @@
/obj/machinery/transformer/proc/unlock_new_robot(mob/living/silicon/robot/R)
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
- sleep(30)
+ sleep(3 SECONDS)
if(R)
R.SetLockdown(0)
R.notify_ai(NEW_BORG)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index ef35c679d10c..030f98a503f1 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -37,20 +37,20 @@
/obj/machinery/washing_machine/process()
if(!busy)
- animate(src, transform=matrix(), time=2)
+ animate(src, transform=matrix(), time=0.2 SECONDS)
return PROCESS_KILL
if(anchored)
if(prob(5))
var/matrix/M = new
M.Translate(rand(-1, 1), rand(0, 1))
- animate(src, transform=M, time=1)
- animate(transform=matrix(), time=1)
+ animate(src, transform=M, time=0.1 SECONDS)
+ animate(transform=matrix(), time=0.1 SECONDS)
else
if(prob(1))
step(src, pick(GLOB.cardinals))
var/matrix/M = new
M.Translate(rand(-3, 3), rand(-1, 3))
- animate(src, transform=M, time=2)
+ animate(src, transform=M, time=0.2 SECONDS)
/obj/machinery/washing_machine/wash(clean_types)
. = ..()
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 61ed2a7dd8f6..b65e39a3def0 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -348,7 +348,7 @@
mechsyringe.icon = initial(mechsyringe.icon)
mechsyringe.update_icon()
break
- sleep(1)
+ sleep(0.1 SECONDS)
return 1
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 0ba442d52ec5..21ff45d7cb71 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -125,7 +125,7 @@
var/iter = 5-get_dist(A,target)
for(var/i=0 to iter)
step_away(A,target)
- sleep(2)
+ sleep(0.2 SECONDS)
var/turf/T = get_turf(target)
log_game("[key_name(chassis.occupant)] used a Gravitational Catapult repulse wave on [AREACOORD(T)]")
return TRUE
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index b640b421b034..ab85df5be233 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -232,7 +232,7 @@
W.reagents.reaction(atm)
if(W.loc == my_target)
break
- sleep(2)
+ sleep(0.2 SECONDS)
return 1
/obj/item/mecha_parts/mecha_equipment/extinguisher/get_equip_info()
@@ -540,4 +540,4 @@
M.wreckage = 0
qdel(M)
playsound(get_turf(N),'sound/items/ratchet.ogg',50,1)
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 81b6aef02977..a9c2621472e2 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -251,7 +251,7 @@
blueeffect.plane = FULLSCREEN_PLANE
blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
M.client.screen += blueeffect
- sleep(20)
+ sleep(2 SECONDS)
M.client.screen -= blueeffect
qdel(blueeffect)
diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm
index c4e68cbeccfe..b717ec190181 100644
--- a/code/game/objects/effects/decals/cleanable/aliens.dm
+++ b/code/game/objects/effects/decals/cleanable/aliens.dm
@@ -30,7 +30,7 @@
var/direction = pick(directions)
for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
if (!mapload)
- sleep(2)
+ sleep(0.2 SECONDS)
if(i > 0)
new /obj/effect/decal/cleanable/xenoblood/xsplatter(loc)
if(!step_to(src, get_step(src, direction), 0))
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index d31a30886fe9..5afc3b69bbdb 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -84,7 +84,7 @@
var/direction = pick(directions)
for(var/i in 0 to pick(0, 200; 1, 150; 2, 50))
if (!mapload)
- sleep(2)
+ sleep(0.2 SECONDS)
if(i > 0)
new /obj/effect/decal/cleanable/blood/splatter(loc, diseases)
if(!step_to(src, get_step(src, direction), 0))
diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm
index 1a60d8a02bfe..641e9eb69349 100644
--- a/code/game/objects/effects/decals/cleanable/robots.dm
+++ b/code/game/objects/effects/decals/cleanable/robots.dm
@@ -16,7 +16,7 @@
var/direction = pick(directions)
for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
if (!mapload)
- sleep(2)
+ sleep(0.2 SECONDS)
if (i > 0)
if (prob(40))
new /obj/effect/decal/cleanable/oil/streak(src.loc)
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 1093f078966d..4ded3e4efe47 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -70,7 +70,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
direction = pick(GLOB.alldirs)
var/steps_amt = pick(1,2,3)
for(var/j in 1 to steps_amt)
- sleep(5)
+ sleep(0.5 SECONDS)
step(E,direction)
if(!QDELETED(src))
addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index d51c771f0e4d..02f82c5d2f67 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -249,7 +249,7 @@
/obj/effect/mine/pickup/Initialize()
. = ..()
- animate(src, pixel_y = 4, time = 20, loop = -1)
+ animate(src, pixel_y = 4, time = 2 SECONDS, loop = -1)
/obj/effect/mine/pickup/triggermine(mob/victim)
if(triggered)
@@ -290,8 +290,8 @@
to_chat(victim, span_warning("KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!"))
victim.client.color = pure_red
- animate(victim.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT)
- sleep(10)
+ animate(victim.client,color = red_splash, time = 1 SECONDS, easing = SINE_EASING|EASE_OUT)
+ sleep(1 SECONDS)
animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT)
sleep(duration)
to_chat(victim, span_notice("Your bloodlust seeps back into the bog of your subconscious and you regain self control."))
diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm
index 92f7e515e533..e7f375e29d7d 100644
--- a/code/game/objects/effects/temporary_visuals/clockcult.dm
+++ b/code/game/objects/effects/temporary_visuals/clockcult.dm
@@ -2,7 +2,7 @@
/obj/effect/temp_visual/ratvar
name = "ratvar's light"
icon = 'icons/effects/clockwork_effects.dmi'
- duration = 8
+ duration = 0.8 SECONDS
randomdir = 0
layer = ABOVE_NORMAL_TURF_LAYER
@@ -67,7 +67,7 @@
icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "belligerent_eye"
pixel_y = 20
- duration = 20
+ duration = 2 SECONDS
/obj/effect/temp_visual/ratvar/belligerent_cast/Initialize()
. = ..()
@@ -75,7 +75,7 @@
/obj/effect/temp_visual/ratvar/mending_mantra
layer = ABOVE_MOB_LAYER
- duration = 20
+ duration = 2 SECONDS
alpha = 200
icon_state = "mending_mantra"
light_range = 1.5
@@ -93,7 +93,7 @@
name = "warden's gaze"
layer = ABOVE_MOB_LAYER
icon_state = "warden_gaze"
- duration = 3
+ duration = 0.3 SECONDS
/obj/effect/temp_visual/ratvar/ocular_warden/Initialize()
. = ..()
@@ -107,7 +107,7 @@
layer = RIPPLE_LAYER
pixel_y = -16
pixel_x = -16
- duration = 30
+ duration = 3 SECONDS
/obj/effect/temp_visual/ratvar/prolonging_prism/Initialize(mapload, set_appearance)
. = ..()
@@ -132,14 +132,14 @@
icon = 'icons/obj/clockwork_objects.dmi'
icon_state = "belligerent_eye"
layer = ABOVE_MOB_LAYER
- duration = 10
+ duration = 1 SECONDS
/obj/effect/temp_visual/ratvar/component/Initialize()
. = ..()
transform = matrix()*0.75
pixel_x = rand(-10, 10)
pixel_y = rand(-10, -2)
- animate(src, pixel_y = pixel_y + 10, alpha = 50, time = 10, easing = EASE_OUT)
+ animate(src, pixel_y = pixel_y + 10, alpha = 50, time = 1 SECONDS, easing = EASE_OUT)
/obj/effect/temp_visual/ratvar/component/cogwheel
icon_state = "vanguard_cogwheel"
@@ -160,7 +160,7 @@
/obj/effect/temp_visual/ratvar/sigil/transgression
color = "#FAE48C"
layer = ABOVE_MOB_LAYER
- duration = 70
+ duration = 7 SECONDS
light_range = 5
light_power = 2
light_color = "#FAE48C"
@@ -168,13 +168,13 @@
/obj/effect/temp_visual/ratvar/sigil/transgression/Initialize()
. = ..()
var/oldtransform = transform
- animate(src, transform = matrix()*2, time = 5)
- animate(transform = oldtransform, alpha = 0, time = 65)
+ animate(src, transform = matrix()*2, time = 0.5 SECONDS)
+ animate(transform = oldtransform, alpha = 0, time = 6.5 SECONDS)
/obj/effect/temp_visual/ratvar/sigil/transmission
color = "#EC8A2D"
layer = ABOVE_MOB_LAYER
- duration = 20
+ duration = 2 SECONDS
light_range = 3
light_power = 1
light_color = "#EC8A2D"
@@ -183,7 +183,7 @@
. = ..()
var/oldtransform = transform
transform = matrix()*transform_multiplier
- animate(src, transform = oldtransform, alpha = 0, time = 20)
+ animate(src, transform = oldtransform, alpha = 0, time = 2 SECONDS)
/obj/effect/temp_visual/ratvar/sigil/vitality
color = "#1E8CE1"
@@ -196,7 +196,7 @@
/obj/effect/temp_visual/ratvar/sigil/submission
color = "#AF0AAF"
layer = ABOVE_MOB_LAYER
- duration = 80
+ duration = 8 SECONDS
icon_state = "sigilactiveoverlay"
alpha = 0
@@ -204,7 +204,7 @@
name = "steam"
desc = "Steam! It's hot. It also serves as a game distribution platform."
icon_state = "smoke"
- duration = 15
+ duration = 1.5 SECONDS
/obj/effect/temp_visual/steam/Initialize(mapload, steam_direction)
. = ..()
@@ -222,7 +222,7 @@
if(WEST)
x_offset = -4
y_offset = 4
- animate(src, pixel_x = x_offset, pixel_y = y_offset, alpha = 50, time = 15)
+ animate(src, pixel_x = x_offset, pixel_y = y_offset, alpha = 50, time = 1.5 SECONDS)
/obj/effect/temp_visual/steam_release
name = "all the steam"
@@ -247,9 +247,9 @@
light_color = "#FFE48E"
light_range = 2
light_power = 0.7
- duration = 50
+ duration = 5 SECONDS
-/obj/effect/temp_visual/ratvar/warp_marker/Initialize(mapload, mob/living/servant, _duration = 50)
+/obj/effect/temp_visual/ratvar/warp_marker/Initialize(mapload, mob/living/servant, _duration = 5 SECONDS)
duration = _duration
. = ..()
animate(src, alpha = 255, time = duration)
@@ -263,7 +263,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
resistance_flags = INDESTRUCTIBLE
layer = MASSIVE_OBJ_LAYER
- duration = 300
+ duration = 30 SECONDS
/obj/effect/temp_visual/ratvar/command_point/Initialize(mapload, appearance)
. = ..()
diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm
index 0f9d7321af0c..93e0638364ea 100644
--- a/code/game/objects/effects/temporary_visuals/cult.dm
+++ b/code/game/objects/effects/temporary_visuals/cult.dm
@@ -2,7 +2,7 @@
/obj/effect/temp_visual/cult
icon = 'icons/effects/cult_effects.dmi'
randomdir = 0
- duration = 10
+ duration = 1 SECONDS
/obj/effect/temp_visual/cult/sparks
randomdir = 1
@@ -11,7 +11,7 @@
/obj/effect/temp_visual/cult/blood // The traditional teleport
name = "blood jaunt"
- duration = 12
+ duration = 1.2 SECONDS
icon_state = "bloodin"
/obj/effect/temp_visual/cult/blood/out
@@ -20,7 +20,7 @@
/obj/effect/temp_visual/dir_setting/cult/phase // The veil shifter teleport
icon = 'icons/effects/cult_effects.dmi'
name = "phase glow"
- duration = 7
+ duration = 0.7 SECONDS
icon_state = "cultin"
/obj/effect/temp_visual/dir_setting/cult/phase/out
@@ -46,12 +46,12 @@
/obj/effect/temp_visual/cult/turf/floor
icon_state = "floorglow"
- duration = 5
+ duration = 0.5
plane = FLOOR_PLANE
/obj/effect/temp_visual/cult/portal
icon_state = "space"
- duration = 600
+ duration = 60 SECONDS
layer = ABOVE_OBJ_LAYER
//visuals for runes being magically created
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 3b454efd6474..a6bee91e747b 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -1,7 +1,7 @@
//unsorted miscellaneous temporary visuals
/obj/effect/temp_visual/dir_setting/bloodsplatter
icon = 'icons/effects/blood.dmi'
- duration = 5
+ duration = 0.5 SECONDS
randomdir = FALSE
layer = BELOW_MOB_LAYER
var/splatter_type = "splatter"
@@ -55,13 +55,13 @@
name = "speedbike trails"
icon_state = "ion_fade"
layer = BELOW_MOB_LAYER
- duration = 10
+ duration = 1 SECONDS
randomdir = 0
/obj/effect/temp_visual/dir_setting/firing_effect
icon = 'icons/effects/effects.dmi'
icon_state = "firing_effect"
- duration = 2
+ duration = 0.2 SECONDS
/obj/effect/temp_visual/dir_setting/firing_effect/setDir(newdir)
switch(newdir)
@@ -79,17 +79,17 @@
/obj/effect/temp_visual/dir_setting/firing_effect/energy
icon_state = "firing_effect_energy"
- duration = 3
+ duration = 0.3 SECONDS
/obj/effect/temp_visual/dir_setting/firing_effect/magic
icon_state = "shieldsparkles"
- duration = 3
+ duration = 0.3 SECONDS
/obj/effect/temp_visual/dir_setting/ninja
name = "ninja shadow"
icon = 'icons/mob/mob.dmi'
icon_state = "uncloak"
- duration = 9
+ duration = 0.9 SECONDS
/obj/effect/temp_visual/dir_setting/ninja/cloak
icon_state = "cloak"
@@ -108,24 +108,24 @@
name = "blood"
icon = 'icons/mob/mob.dmi'
icon_state = "phase_shift2"
- duration = 12
+ duration = 1.2 SECONDS
/obj/effect/temp_visual/dir_setting/wraith/out
icon_state = "phase_shift"
/obj/effect/temp_visual/dir_setting/tailsweep
icon_state = "tailsweep"
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/dir_setting/curse
icon_state = "curse"
- duration = 32
+ duration = 3.2 SECONDS
var/fades = TRUE
/obj/effect/temp_visual/dir_setting/curse/Initialize(mapload, set_dir)
. = ..()
if(fades)
- animate(src, alpha = 0, time = 32)
+ animate(src, alpha = 0, time = 3.2 SECONDS)
/obj/effect/temp_visual/dir_setting/curse/blob
icon_state = "curseblob"
@@ -135,11 +135,11 @@
layer = LARGE_MOB_LAYER
pixel_y = -16
pixel_x = -16
- duration = 32
+ duration = 3.2 SECONDS
fades = FALSE
/obj/effect/temp_visual/dir_setting/curse/grasp_portal/fading
- duration = 32
+ duration = 3.2 SECONDS
fades = TRUE
/obj/effect/temp_visual/dir_setting/curse/hand
@@ -156,7 +156,7 @@
icon_state = "beam_splash_l"
layer = ABOVE_ALL_MOB_LAYER
pixel_y = -16
- duration = 50
+ duration = 5 SECONDS
/obj/effect/temp_visual/bsa_splash/Initialize(mapload, dir)
. = ..()
@@ -173,16 +173,16 @@
name = "water"
icon = 'icons/mob/mob.dmi'
icon_state = "reappear"
- duration = 5
+ duration = 0.5 SECONDS
/obj/effect/temp_visual/wizard/out
icon_state = "liquify"
- duration = 12
+ duration = 1.2 SECONDS
/obj/effect/temp_visual/monkeyify
icon = 'icons/mob/mob.dmi'
icon_state = "h2monkey"
- duration = 22
+ duration = 2.2 SECONDS
/obj/effect/temp_visual/monkeyify/humanify
icon_state = "monkey2h"
@@ -190,13 +190,13 @@
/obj/effect/temp_visual/borgflash
icon = 'icons/mob/mob.dmi'
icon_state = "blspell"
- duration = 5
+ duration = 0.5 SECONDS
/obj/effect/temp_visual/guardian
randomdir = 0
/obj/effect/temp_visual/guardian/phase
- duration = 5
+ duration = 0.5 SECONDS
icon_state = "phasein"
/obj/effect/temp_visual/guardian/phase/out
@@ -204,7 +204,7 @@
/obj/effect/temp_visual/decoy
desc = "It's a decoy!"
- duration = 15
+ duration = 1.5 SECONDS
/obj/effect/temp_visual/decoy/Initialize(mapload, atom/mimiced_atom)
. = ..()
@@ -220,27 +220,27 @@
animate(src, alpha = 0, time = duration)
/obj/effect/temp_visual/decoy/fading/threesecond
- duration = 40
+ duration = 4 SECONDS
/obj/effect/temp_visual/decoy/fading/fivesecond
- duration = 50
+ duration = 5 SECONDS
/obj/effect/temp_visual/decoy/fading/halfsecond
- duration = 5
+ duration = 0.5 SECONDS
/obj/effect/temp_visual/small_smoke
icon_state = "smoke"
- duration = 50
+ duration = 5 SECONDS
/obj/effect/temp_visual/small_smoke/halfsecond
- duration = 5
+ duration = 0.5 SECONDS
/obj/effect/temp_visual/fire
icon = 'icons/effects/fire.dmi'
icon_state = "3"
light_range = LIGHT_RANGE_FIRE
light_color = LIGHT_COLOR_FIRE
- duration = 10
+ duration = 1 SECONDS
/obj/effect/temp_visual/revenant
name = "spooky lights"
@@ -249,17 +249,17 @@
/obj/effect/temp_visual/revenant/cracks
name = "glowing cracks"
icon_state = "purplecrack"
- duration = 6
+ duration = 0.6 SECONDS
/obj/effect/temp_visual/gravpush
name = "gravity wave"
icon_state = "shieldsparkles"
- duration = 5
+ duration = 0.5 SECONDS
/obj/effect/temp_visual/telekinesis
name = "telekinetic force"
icon_state = "empdisable"
- duration = 5
+ duration = 0.5 SECONDS
/obj/effect/temp_visual/emp
name = "emp sparks"
@@ -268,17 +268,17 @@
/obj/effect/temp_visual/emp/pulse
name = "emp pulse"
icon_state = "emppulse"
- duration = 8
+ duration = 0.8 SECONDS
randomdir = 0
/obj/effect/temp_visual/bluespace_fissure
name = "bluespace fissure"
icon_state = "bluestream_fade"
- duration = 9
+ duration = 0.9 SECONDS
/obj/effect/temp_visual/gib_animation
icon = 'icons/mob/mob.dmi'
- duration = 15
+ duration = 1.5 SECONDS
/obj/effect/temp_visual/gib_animation/Initialize(mapload, gib_icon)
icon_state = gib_icon // Needs to be before ..() so icon is correct
@@ -289,7 +289,7 @@
/obj/effect/temp_visual/dust_animation
icon = 'icons/mob/mob.dmi'
- duration = 15
+ duration = 1.5 SECONDS
/obj/effect/temp_visual/dust_animation/Initialize(mapload, dust_icon)
icon_state = dust_icon // Before ..() so the correct icon is flick()'d
@@ -298,17 +298,17 @@
/obj/effect/temp_visual/mummy_animation
icon = 'icons/mob/mob.dmi'
icon_state = "mummy_revive"
- duration = 20
+ duration = 2 SECONDS
/obj/effect/temp_visual/wax_animation
icon = 'icons/mob/mob.dmi'
icon_state = "wax_revive"
- duration = 20
+ duration = 2 SECONDS
/obj/effect/temp_visual/heal //color is white by default, set to whatever is needed
name = "healing glow"
icon_state = "heal"
- duration = 15
+ duration = 1.5 SECONDS
/obj/effect/temp_visual/heal/Initialize(mapload, set_color)
if(set_color)
@@ -322,7 +322,7 @@
icon = 'icons/obj/projectiles.dmi'
icon_state = "kinetic_blast"
layer = ABOVE_ALL_MOB_LAYER
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/explosion
name = "explosion"
@@ -330,27 +330,27 @@
icon_state = "explosion"
pixel_x = -32
pixel_y = -32
- duration = 8
+ duration = 0.8 SECONDS
/obj/effect/temp_visual/explosion/fast
icon_state = "explosionfast"
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/blob
name = "blob"
icon_state = "blob_attack"
alpha = 140
randomdir = 0
- duration = 6
+ duration = 0.6 SECONDS
/obj/effect/temp_visual/desynchronizer
name = "desynchronizer field"
icon_state = "chronofield"
- duration = 3
+ duration = 0.3 SECONDS
/obj/effect/temp_visual/impact_effect
icon_state = "impact_bullet"
- duration = 5
+ duration = 0.5 SECONDS
/obj/effect/temp_visual/impact_effect/Initialize(mapload, x, y)
pixel_x = x
@@ -359,45 +359,45 @@
/obj/effect/temp_visual/impact_effect/red_laser
icon_state = "impact_laser"
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/impact_effect/red_laser/wall
icon_state = "impact_laser_wall"
- duration = 10
+ duration = 1 SECONDS
/obj/effect/temp_visual/impact_effect/blue_laser
icon_state = "impact_laser_blue"
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/impact_effect/green_laser
icon_state = "impact_laser_green"
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/impact_effect/purple_laser
icon_state = "impact_laser_purple"
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/impact_effect/ion
icon_state = "shieldsparkles"
- duration = 6
+ duration = 0.6 SECONDS
/obj/effect/temp_visual/heart
name = "heart"
icon = 'icons/mob/animal.dmi'
icon_state = "heart"
- duration = 25
+ duration = 2.5 SECONDS
/obj/effect/temp_visual/heart/Initialize(mapload)
. = ..()
pixel_x = rand(-4,4)
pixel_y = rand(-4,4)
- animate(src, pixel_y = pixel_y + 32, alpha = 0, time = 25)
+ animate(src, pixel_y = pixel_y + 32, alpha = 0, time = 2.5 SECONDS)
/obj/effect/temp_visual/love_heart
name = "love heart"
icon = 'icons/effects/effects.dmi'
icon_state = "heart"
- duration = 25
+ duration = 2.5 SECONDS
/obj/effect/temp_visual/love_heart/Initialize(mapload)
. = ..()
@@ -420,7 +420,7 @@
name = "bleed"
icon = 'icons/effects/bleed.dmi'
icon_state = "bleed0"
- duration = 10
+ duration = 1 SECONDS
var/shrink = TRUE
/obj/effect/temp_visual/bleed/Initialize(mapload, atom/size_calc_target)
@@ -440,11 +440,11 @@
/obj/effect/temp_visual/bleed/explode
icon_state = "bleed10"
- duration = 12
+ duration = 1.2 SECONDS
shrink = FALSE
/obj/effect/temp_visual/warp_cube
- duration = 5
+ duration = 0.5 SECONDS
var/outgoing = TRUE
/obj/effect/temp_visual/warp_cube/Initialize(mapload, atom/teleporting_atom, warp_color, new_outgoing)
@@ -475,7 +475,7 @@
icon = 'icons/effects/atmospherics.dmi'
icon_state = "space_wind"
layer = FLY_LAYER
- duration = 20
+ duration = 2 SECONDS
mouse_opacity = 0
/obj/effect/temp_visual/dir_setting/space_wind/Initialize(mapload, set_dir, set_alpha = 255)
diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm
index bc3b7e93ab31..92139cf14847 100644
--- a/code/game/objects/items/crab17.dm
+++ b/code/game/objects/items/crab17.dm
@@ -85,17 +85,17 @@
/obj/structure/checkoutmachine/proc/startUp() //very VERY snowflake code that adds a neat animation when the pod lands.
start_dumping() //The machine doesnt move during this time, giving people close by a small window to grab their funds before it starts running around
- sleep(10)
+ sleep(1 SECONDS)
if(QDELETED(src))
return
playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
cut_overlay("flaps")
- sleep(10)
+ sleep(1 SECONDS)
if(QDELETED(src))
return
playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
cut_overlay("hatch")
- sleep(30)
+ sleep(3 SECONDS)
if(QDELETED(src))
return
playsound(src,'sound/machines/twobeep.ogg',50,0)
@@ -108,31 +108,31 @@
add_overlay("legs_extending")
cut_overlay("legs_retracted")
pixel_z += 4
- sleep(5)
+ sleep(0.5 SECONDS)
if(QDELETED(src))
return
add_overlay("legs_extended")
cut_overlay("legs_extending")
pixel_z += 4
- sleep(20)
+ sleep(2 SECONDS)
if(QDELETED(src))
return
add_overlay("screen_lines")
- sleep(5)
+ sleep(0.5 SECONDS)
if(QDELETED(src))
return
cut_overlay("screen_lines")
- sleep(5)
+ sleep(0.5 SECONDS)
if(QDELETED(src))
return
add_overlay("screen_lines")
add_overlay("screen")
- sleep(5)
+ sleep(0.5 SECONDS)
if(QDELETED(src))
return
playsound(src,'sound/machines/triple_beep.ogg',50,0)
add_overlay("text")
- sleep(10)
+ sleep(1 SECONDS)
if(QDELETED(src))
return
add_overlay("legs")
@@ -220,7 +220,7 @@
DF = new /obj/effect/dumpeetFall(drop_location())
dump = new /obj/structure/checkoutmachine(null, bogdanoff)
priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src)] and cash out before you lose all of your funds!", sender_override = "CRAB-17 Protocol")
- animate(DF, pixel_z = -8, time = 5, , easing = LINEAR_EASING)
+ animate(DF, pixel_z = -8, time = 0.5 SECONDS, , easing = LINEAR_EASING)
playsound(src, 'sound/weapons/mortar_whistle.ogg', 70, 1, 6)
addtimer(CALLBACK(src, .proc/endLaunch), 5, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 009dc63d7ae0..de7419e7654a 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -484,7 +484,7 @@
if(req_defib)
defib.cooldowncheck(user)
else
- recharge(60)
+ recharge(6 SECONDS)
/obj/item/twohanded/shockpaddles/proc/do_harm(mob/living/carbon/H, mob/living/user)
if(req_defib && defib.safety)
@@ -535,7 +535,7 @@
busy = FALSE
update_icon()
if(!req_defib)
- recharge(60)
+ recharge(6 SECONDS)
if(req_defib && (defib.cooldowncheck(user)))
return
busy = FALSE
@@ -632,7 +632,7 @@
if(req_defib)
defib.cooldowncheck(user)
else
- recharge(60)
+ recharge(6 SECONDS)
else if (!H.getorgan(/obj/item/organ/heart))
user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Patient's heart is missing. Operation aborted."))
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm
index 7e0107cd8d2e..6bba8762394e 100644
--- a/code/game/objects/items/dehy_carp.dm
+++ b/code/game/objects/items/dehy_carp.dm
@@ -30,7 +30,7 @@
icon = 'icons/mob/carp.dmi'
flick("carp_swell", src)
//Wait for animation to end
- sleep(6)
+ sleep(0.6 SECONDS)
if(!src || QDELETED(src))//we got toasted while animating
return
//Make space carp
@@ -55,7 +55,7 @@
if(istype(H))
H.Paralyze(30)
forceMove(H) //we move it AWAAAYY
- sleep(20)
+ sleep(2 SECONDS)
if(QDELETED(src))
return SHAME
@@ -65,7 +65,7 @@
forceMove(get_turf(H)) //we move it back
icon = 'icons/mob/carp.dmi'
flick("carp_swell", src)
- sleep(6) //let the animation play out
+ sleep(0.6 SECONDS) //let the animation play out
if(!QDELETED(src))
var/mob/living/M = new mobtype(get_turf(src))
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 8914c613c5aa..80cc31edae5f 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -92,7 +92,7 @@
while(AI.stat != DEAD && flush)
AI.adjustOxyLoss(1)
AI.updatehealth()
- sleep(5)
+ sleep(0.5 SECONDS)
flush = FALSE
. = TRUE
if("wireless")
@@ -103,4 +103,4 @@
AI.radio_enabled = !AI.radio_enabled
to_chat(AI, "Your Subspace Transceiver has been [AI.radio_enabled ? "enabled" : "disabled"]!")
. = TRUE
- update_icon()
\ No newline at end of file
+ update_icon()
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 992e7ca181c8..0feefa1488bd 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -144,7 +144,7 @@
while(recording && used < max)
mytape.used_capacity++
used++
- sleep(10)
+ sleep(1 SECONDS)
recording = 0
update_icon()
else
@@ -189,7 +189,7 @@
to_chat(usr, span_notice("Playing started."))
var/used = mytape.used_capacity //to stop runtimes when you eject the tape
var/max = mytape.max_capacity
- for(var/i = 1, used < max, sleep(10 * playsleepseconds))
+ for(var/i = 1, used < max, sleep(1 SECONDS * playsleepseconds))
if(!mytape)
break
if(playing == 0)
@@ -199,12 +199,12 @@
say(mytape.storedinfo[i])
if(mytape.storedinfo.len < i + 1)
playsleepseconds = 1
- sleep(10)
+ sleep(1 SECONDS)
say("End of recording.")
else
playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i]
if(playsleepseconds > 14)
- sleep(10)
+ sleep(1 SECONDS)
say("Skipping [playsleepseconds] seconds of silence")
playsleepseconds = 1
i++
@@ -265,7 +265,7 @@
P.name = "paper- 'Transcript'"
usr.put_in_hands(P)
canprint = 0
- sleep(300)
+ sleep(30 SECONDS)
canprint = 1
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index c418565954dc..24f20ceda78c 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -256,7 +256,7 @@ effective or pretty fucking useless.
charge = max(0,charge - 25)//Quick decrease in light
else
charge = min(max_charge,charge + 50) //Charge in the dark
- animate(user,alpha = clamp(255 - charge,0,255),time = 10)
+ animate(user,alpha = clamp(255 - charge,0,255),time = 1 SECONDS)
/obj/item/jammer
diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm
index 62d9edb8fe81..0996bb4048aa 100644
--- a/code/game/objects/items/flamethrower.dm
+++ b/code/game/objects/items/flamethrower.dm
@@ -192,7 +192,7 @@
igniter.ignite_turf(src,T)
else
default_ignite(T)
- sleep(1)
+ sleep(0.1 SECONDS)
previousturf = T
operating = FALSE
for(var/mob/M in viewers(1, loc))
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index aaf5d2ce2a3e..216e86c0d5de 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -14,7 +14,7 @@
resistance_flags = FLAMMABLE
max_integrity = 40
var/active = 0
- var/det_time = 50
+ var/det_time = 5 SECONDS
var/display_timer = 1
var/clumsy_check = GRENADE_CLUMSY_FUMBLE
@@ -105,18 +105,18 @@
if(time != null)
if(time < 3)
time = 3
- det_time = round(clamp(time * 10, 0, 50))
+ det_time = round(clamp(time * 1 SECONDS, 0, 5 SECONDS))
else
var/previous_time = det_time
switch(det_time)
- if (0)
- det_time = 30
- if (30)
- det_time = 50
- if (50)
- det_time = 0
+ if (0 SECONDS)
+ det_time = 3 SECONDS
+ if (3 SECONDS)
+ det_time = 5 SECONDS
+ if (5 SECONDS)
+ det_time = 0 SECONDS
if(det_time == previous_time)
- det_time = 50
+ det_time = 5 SECONDS
/obj/item/grenade/attack_paw(mob/user)
return attack_hand(user)
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 135595f0d7b8..b5a3806ee098 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -203,7 +203,7 @@
target = user
message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [name] at [ADMIN_VERBOSEJMP(src)]")
log_game("[key_name(user)] suicided with [name] at [AREACOORD(user)]")
- sleep(10)
+ sleep(1 SECONDS)
prime()
user.gib(1, 1)
diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm
index ac0c38194c06..28d872c9ce34 100644
--- a/code/game/objects/items/grenades/smokebomb.dm
+++ b/code/game/objects/items/grenades/smokebomb.dm
@@ -26,5 +26,5 @@
for(var/obj/structure/blob/B in view(8,src))
var/damage = round(30/(get_dist(B,src)+1))
B.take_damage(damage, BURN, MELEE, 0)
- sleep(80)
+ sleep(8 SECONDS)
qdel(src)
diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm
index d85063ef311b..ceee173b4cc3 100644
--- a/code/game/objects/items/his_grace.dm
+++ b/code/game/objects/items/his_grace.dm
@@ -150,10 +150,10 @@
M4.Translate(0, -1)
transforms = list(M1, M2, M3, M4)
- animate(src, transform=transforms[1], time=0.2, loop=-1)
- animate(transform=transforms[2], time=0.1)
- animate(transform=transforms[3], time=0.2)
- animate(transform=transforms[4], time=0.3)
+ animate(src, transform=transforms[1], time=0.02 SECONDS, loop=-1)
+ animate(transform=transforms[2], time=0.01 SECONDS)
+ animate(transform=transforms[3], time=0.02 SECONDS)
+ animate(transform=transforms[4], time=0.03 SECONDS)
/obj/item/his_grace/proc/drowse() //Good night, Mr. Grace.
if(!awakened || ascended)
diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm
index a6a8b5ec0f5f..8def747320e5 100644
--- a/code/game/objects/items/implants/implant_explosive.dm
+++ b/code/game/objects/items/implants/implant_explosive.dm
@@ -7,7 +7,7 @@
var/weak = 2
var/medium = 0.8
var/heavy = 0.4
- var/delay = 7
+ var/delay = 0.7 SECONDS
var/popup = FALSE // is the DOUWANNABLOWUP window open?
var/active = FALSE
@@ -90,7 +90,7 @@
weak = 16
medium = 8
heavy = 4
- delay = 70
+ delay = 7 SECONDS
/obj/item/implant/explosive/macro/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE)
for(var/X in target.implants)
@@ -121,4 +121,4 @@
/obj/item/implanter/explosive_macro
name = "implanter (macrobomb)"
- imp_type = /obj/item/implant/explosive/macro
\ No newline at end of file
+ imp_type = /obj/item/implant/explosive/macro
diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm
index 74f04c679695..1bc2c38f7e71 100644
--- a/code/game/objects/items/implants/implant_stealth.dm
+++ b/code/game/objects/items/implants/implant_stealth.dm
@@ -17,7 +17,7 @@
move_speed_multiplier = 0.5
/obj/structure/closet/cardboard/agent/proc/go_invisible()
- animate(src, , alpha = 0, time = 20)
+ animate(src, , alpha = 0, time = 2 SECONDS)
/obj/structure/closet/cardboard/agent/Initialize()
. = ..()
diff --git a/code/game/objects/items/mantis.dm b/code/game/objects/items/mantis.dm
index d1fc427cc2cd..58210e0abb76 100644
--- a/code/game/objects/items/mantis.dm
+++ b/code/game/objects/items/mantis.dm
@@ -27,7 +27,7 @@
. = ..()
var/obj/item/mantis/blade/secondsword = user.get_inactive_held_item()
if(istype(secondsword, /obj/item/mantis/blade) && !secondattack)
- sleep(2)
+ sleep(0.2 SECONDS)
secondsword.attack(M, user, TRUE)
return
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index f1c35d025be6..98401cfe48a2 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -512,7 +512,7 @@
playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
if (!QDELETED(H))
H.emote("spin")
- sleep(20)
+ sleep(2 SECONDS)
for(var/obj/item/W in H)
H.dropItemToGround(W)
if(prob(50))
@@ -522,7 +522,7 @@
var/obj/item/bodypart/BP = i
BP.generic_bleedstacks += 5
H.gib_animation()
- sleep(3)
+ sleep(0.3 SECONDS)
H.adjustBruteLoss(1000) //to make the body super-bloody
H.spawn_gibs()
H.spill_organs()
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 4f0904ff53b7..dcb45578d660 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -394,7 +394,7 @@
else
playsound(src, on_sound, 50, 1)
add_fingerprint(user)
- sleep(3)
+ sleep(0.3 SECONDS)
if (!QDELETED(H))
if(!QDELETED(B))
H.internal_organs -= B
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 20b85d155a87..93d811fa4445 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -412,7 +412,7 @@
P.clashing = FALSE
return
playsound(src, 'sound/magic/clockwork/ratvar_attack.ogg', 50, TRUE, frequency = 2)
- sleep(2.4)
+ sleep(0.24 SECONDS)
if(QDELETED(src))
P.clashing = FALSE
return
@@ -423,7 +423,7 @@
a_winnar_is = src
break
P.SpinAnimation(5, 0)
- sleep(5)
+ sleep(0.5 SECONDS)
if(QDELETED(src))
P.clashing = FALSE
return
@@ -431,7 +431,7 @@
clash_target = null
return
playsound(P, 'sound/magic/clockwork/narsie_attack.ogg', 50, TRUE, frequency = 2)
- sleep(3.3)
+ sleep(0.33 SECONDS)
if(QDELETED(src))
P.clashing = FALSE
return
@@ -443,7 +443,7 @@
break
SpinAnimation(5, 0)
victory_chance += 10
- sleep(5)
+ sleep(0.5 SECONDS)
if(!a_winnar_is)
a_winnar_is = pick(src, P)
if(a_winnar_is == src)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index ead62d19617e..c7e1ad01b75c 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -33,7 +33,7 @@
user.say("[warcry]", forced="banner")
var/old_transform = user.transform
user.transform *= 1.2
- animate(user, transform = old_transform, time = 10)
+ animate(user, transform = old_transform, time = 1 SECONDS)
morale_time = world.time + morale_cooldown
var/list/inspired = list()
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 85cee6c73b52..82b3bd3d327d 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -778,10 +778,10 @@
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(1, R.loc)
smoke.start()
- sleep(2)
+ sleep(0.2 SECONDS)
for(var/i in 1 to 4)
playsound(R, pick('sound/items/drill_use.ogg', 'sound/items/jaws_cut.ogg', 'sound/items/jaws_pry.ogg', 'sound/items/welder.ogg', 'sound/items/ratchet.ogg'), 80, 1, -1)
- sleep(12)
+ sleep(1.2 SECONDS)
if(!prev_lockcharge)
R.SetLockdown(0)
R.anchored = FALSE
diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm
index fc18364cccd3..fa2802870e34 100644
--- a/code/game/objects/items/signs.dm
+++ b/code/game/objects/items/signs.dm
@@ -44,17 +44,17 @@
user.manual_emote("waves around a blank sign.")
var/direction = prob(50) ? -1 : 1
if(NSCOMPONENT(user.dir)) //So signs are waved horizontally relative to what way the player waving it is facing.
- animate(user, pixel_x = user.pixel_x + (1 * direction), time = 1, easing = SINE_EASING)
- animate(pixel_x = user.pixel_x - (2 * direction), time = 1, easing = SINE_EASING)
- animate(pixel_x = user.pixel_x + (2 * direction), time = 1, easing = SINE_EASING)
- animate(pixel_x = user.pixel_x - (2 * direction), time = 1, easing = SINE_EASING)
+ animate(user, pixel_x = user.pixel_x + (1 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
+ animate(pixel_x = user.pixel_x - (2 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
+ animate(pixel_x = user.pixel_x + (2 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
+ animate(pixel_x = user.pixel_x - (2 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
animate(pixel_x = user.pixel_x + (1 * direction), time = 1, easing = SINE_EASING)
else
- animate(user, pixel_y = user.pixel_y + (1 * direction), time = 1, easing = SINE_EASING)
- animate(pixel_y = user.pixel_y - (2 * direction), time = 1, easing = SINE_EASING)
- animate(pixel_y = user.pixel_y + (2 * direction), time = 1, easing = SINE_EASING)
- animate(pixel_y = user.pixel_y - (2 * direction), time = 1, easing = SINE_EASING)
- animate(pixel_y = user.pixel_y + (1 * direction), time = 1, easing = SINE_EASING)
+ animate(user, pixel_y = user.pixel_y + (1 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
+ animate(pixel_y = user.pixel_y - (2 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
+ animate(pixel_y = user.pixel_y + (2 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
+ animate(pixel_y = user.pixel_y - (2 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
+ animate(pixel_y = user.pixel_y + (1 * direction), time = 0.1 SECONDS, easing = SINE_EASING)
user.changeNext_move(CLICK_CD_MELEE)
/datum/crafting_recipe/picket_sign
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index c13e1898fd50..8b37fef12dae 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -64,8 +64,8 @@
/obj/item/storage/backpack/holding/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is jumping into [src]! It looks like [user.p_theyre()] trying to commit suicide."))
user.dropItemToGround(src, TRUE)
- user.Stun(100, ignore_canstun = TRUE)
- sleep(20)
+ user.Stun(10 SECONDS, ignore_canstun = TRUE)
+ sleep(2 SECONDS)
playsound(src, "rustle", 50, 1, -5)
qdel(user)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 78bbb68550a7..d977fc643e5e 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -306,7 +306,7 @@
for(var/i = 1, i <= rand(1,2), i++)
if(I)
step(I, pick(NORTH,SOUTH,EAST,WEST))
- sleep(rand(2,4))
+ sleep(rand(0.2 SECONDS, 0.4 SECONDS))
if(prob(50))
playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index 1febbbffef68..7800fb45cd09 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -138,7 +138,7 @@
var/obj/item/bodypart/BP = i
BP.generic_bleedstacks += 5
H.gib_animation()
- sleep(3)
+ sleep(0.3 SECONDS)
H.adjustBruteLoss(1000) //to make the body super-bloody
H.spawn_gibs()
H.spill_organs()
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index 8953fc6cba88..b8291d18bc7d 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -277,9 +277,9 @@
playsound(src,'sound/items/syringeproj.ogg',40,1)
for(var/a=0, a<5, a++)
step_towards(A, target)
- sleep(2)
+ sleep(0.2 SECONDS)
A.Smoke()
- spawn(100)
+ spawn(10 SECONDS)
if(src)
resin_cooldown = FALSE
return
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 13ce52acad59..08585cf4ef53 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -60,11 +60,11 @@
// during their ascension
// Stun stops them from wandering off
- user.Stun(100, ignore_canstun = TRUE)
+ user.Stun(10 SECONDS, ignore_canstun = TRUE)
playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1)
// Let the sound effect finish playing
- sleep(20)
+ sleep(2 SECONDS)
if(!user)
return
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index ff7225d52fd7..0b611dc6cdce 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -562,7 +562,7 @@
spawn(0)
for(var/message in messages)
toy_talk(user, message)
- sleep(10)
+ sleep(1 SECONDS)
cooldown = TRUE
spawn(recharge_time)
@@ -1116,12 +1116,12 @@
/obj/item/toy/nuke/attack_self(mob/user)
if (cooldown < world.time)
- cooldown = world.time + 1800 //3 minutes
+ cooldown = world.time + 3 MINUTES //3 minutes
user.visible_message(span_warning("[user] presses a button on [src]."), span_notice("You activate [src], it plays a loud noise!"), span_italics("You hear the click of a button."))
- sleep(5)
+ sleep(0.5 SECONDS)
icon_state = "nuketoy"
playsound(src, 'sound/machines/alarm.ogg', 100, 0)
- sleep(135)
+ sleep(13.5 SECONDS)
icon_state = "nuketoycool"
sleep(cooldown - world.time)
icon_state = "nuketoyidle"
@@ -1167,7 +1167,7 @@
playsound(src, boom_sound, 50, 0)
for(var/mob/M in urange(10, src)) // Checks range
if(!M.stat && !isAI(M)) // Checks to make sure whoever's getting shaken is alive/not the AI
- sleep(8) // Short delay to match up with the explosion sound
+ sleep(0.8 SECONDS) // Short delay to match up with the explosion sound
shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second.
else
@@ -1326,7 +1326,7 @@ obj/item/toy/turn_tracker
cooldown = (world.time + 50) //5 second cooldown
user.visible_message(span_notice("[user] pulls back the string on [src]."))
icon_state = "[initial(icon_state)]_used"
- sleep(5)
+ sleep(0.5 SECONDS)
audible_message(span_danger("[icon2html(src, viewers(src))] Hiss!"))
var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg')
var/chosen_sound = pick(possible_sounds)
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 181c7bded0fe..075dc6e2c661 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -336,7 +336,7 @@
user.emote("spin")
if (i == 3 && myhead)
myhead.drop_limb()
- sleep(3)
+ sleep(0.3 SECONDS)
else
user.visible_message(span_suicide("[user] panics and starts choking to death!"))
return OXYLOSS
@@ -389,7 +389,7 @@
user.setDir(i)
if(i == WEST)
user.emote("flip")
- sleep(1)
+ sleep(0.1 SECONDS)
/obj/item/twohanded/dualsaber/proc/impale(mob/living/user)
to_chat(user, span_warning("You twirl around a bit before losing your balance and impaling yourself on [src]."))
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 61d78c706d40..104105113041 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -55,7 +55,7 @@
var/image/I = image('icons/obj/closet.dmi', A, "cardboard_special", A.layer+1)
flick_overlay_view(I, A, 8)
I.alpha = 0
- animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
+ animate(I, pixel_z = 32, alpha = 255, time = 0.5 SECONDS, easing = ELASTIC_EASING)
/obj/structure/closet/cardboard/metal
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 4e1e7e429ee7..00168d035c68 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -326,8 +326,8 @@
if(src)
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/obj/structure/grille/ratvar/ratvar_act()
return
diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm
index 71332dc00e43..0dad2c71766d 100644
--- a/code/game/objects/structures/hivebot.dm
+++ b/code/game/objects/structures/hivebot.dm
@@ -29,7 +29,7 @@
new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
if("rapid")
new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
- sleep(100)
+ sleep(10 SECONDS)
visible_message(span_boldannounce("[src] warps out!"))
playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
qdel(src)
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 1e458215fc58..fa400a626f8a 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -81,7 +81,7 @@
buckle_mob(L, force=1)
var/matrix/m180 = matrix(L.transform)
m180.Turn(180)
- animate(L, transform = m180, time = 3)
+ animate(L, transform = m180, time = 0.3 SECONDS)
L.pixel_y = L.get_standard_pixel_y_offset(180)
else if (has_buckled_mobs())
for(var/mob/living/L in buckled_mobs)
@@ -126,13 +126,13 @@
/obj/structure/kitchenspike/proc/release_mob(mob/living/M)
var/matrix/m180 = matrix(M.transform)
m180.Turn(180)
- animate(M, transform = m180, time = 3)
+ animate(M, transform = m180, time = 0.3 SECONDS)
M.pixel_y = M.get_standard_pixel_y_offset(180)
M.adjustBruteLoss(30)
src.visible_message(span_danger("[M] falls free of [src]!"))
unbuckle_mob(M,force=1)
M.emote("scream")
- M.AdjustParalyzed(20)
+ M.AdjustParalyzed(2 SECONDS)
/obj/structure/kitchenspike/Destroy()
if(has_buckled_mobs())
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index fcde243c551a..10368390370a 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -90,7 +90,7 @@
playsound(src, openSound, 100, 1)
set_opacity(FALSE)
flick("[initial(icon_state)]opening",src)
- sleep(10)
+ sleep(1 SECONDS)
density = FALSE
door_opened = TRUE
layer = OPEN_DOOR_LAYER
@@ -110,7 +110,7 @@
isSwitchingStates = TRUE
playsound(src, closeSound, 100, 1)
flick("[initial(icon_state)]closing",src)
- sleep(10)
+ sleep(1 SECONDS)
density = TRUE
set_opacity(TRUE)
door_opened = FALSE
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index a547a3a7ec35..aa1aeead4d62 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -285,7 +285,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
if(!locate(/obj/effect/decal/cleanable/ash) in get_step(src, dir))//prevent pile-up
new/obj/effect/decal/cleanable/ash/crematorium(src)
- sleep(30)
+ sleep(3 SECONDS)
if(!QDELETED(src))
locked = FALSE
diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm
index cd661a7172f5..bea82cdf3372 100644
--- a/code/game/objects/structures/table_frames.dm
+++ b/code/game/objects/structures/table_frames.dm
@@ -128,5 +128,5 @@
if(src) //do we still exist?
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index bf8ba3cf0a33..302e81efc188 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -488,8 +488,8 @@
if(src) //do we still exist?
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/obj/structure/table/reinforced/brass/ratvar_act()
obj_integrity = max_integrity
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 4e73ff46e6f0..e39f803659bc 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -13,14 +13,14 @@
tube_construction = /obj/structure/c_transit_tube/station
var/open_status = STATION_TUBE_CLOSED
var/pod_moving = 0
- var/cooldown_delay = 50
+ var/cooldown_delay = 5 SECONDS
var/launch_cooldown = 0
var/reverse_launch = FALSE
var/base_icon = "station0"
var/boarding_dir //from which direction you can board the tube
- var/const/OPEN_DURATION = 6
- var/const/CLOSE_DURATION = 6
+ var/const/OPEN_DURATION = 0.6 SECONDS
+ var/const/CLOSE_DURATION = 0.6 SECONDS
/obj/structure/transit_tube/station/New()
..()
@@ -174,7 +174,7 @@
if (pod.cargo)
launch_cooldown = cooldown_delay * 0.5 + world.time //Cargo pods spend half as long at the station
open_animation()
- sleep(OPEN_DURATION + 2)
+ sleep(OPEN_DURATION + 0.2 SECONDS)
pod_moving = FALSE
if(!QDELETED(pod))
var/datum/gas_mixture/floor_mixture = loc.return_air()
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 87a3b7faab6b..2f538d929099 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -7,7 +7,7 @@
anchored = TRUE
alpha = 30 //initially quite hidden when not "recharging"
var/last_trigger = 0
- var/time_between_triggers = 600 //takes a minute to recharge
+ var/time_between_triggers = 1 MINUTES //takes a minute to recharge
var/charges = INFINITY
var/list/static/ignore_typecache
@@ -50,8 +50,8 @@
last_trigger = world.time
charges--
if(charges <= 0)
- animate(src, alpha = 0, time = 10)
- QDEL_IN(src, 10)
+ animate(src, alpha = 0, time = 1 SECONDS)
+ QDEL_IN(src, 1 SECONDS)
else
animate(src, alpha = initial(alpha), time = time_between_triggers)
@@ -135,7 +135,7 @@
desc = "A divine barrier, It looks like you could destroy it with enough effort, or wait for it to dissipate..."
icon_state = "ward"
density = TRUE
- time_between_triggers = 1200 //Exists for 2 minutes
+ time_between_triggers = 2 MINUTES //Exists for 2 minutes
/obj/structure/trap/ward/Initialize()
. = ..()
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index f38559842e55..a8b1cc67b73e 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -810,8 +810,8 @@
if(!QDELETED(src))
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/obj/structure/window/reinforced/clockwork/unanchored
anchored = FALSE
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 02de1c217e0a..ff7dc844f37a 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -229,8 +229,8 @@
if(istype(src, /turf/open/floor/clockwork)) //if we haven't changed type
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/turf/open/floor/clockwork/reebe
name = "cogplate"
diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm
index 7bd03fdf6518..df35421017b3 100644
--- a/code/game/turfs/simulated/floor/reinf_floor.dm
+++ b/code/game/turfs/simulated/floor/reinf_floor.dm
@@ -160,8 +160,8 @@
if(istype(src, /turf/open/floor/engine/cult)) //if we haven't changed type
var/previouscolor = color
color = "#FAE48C"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/turf/open/floor/engine/cult/airless
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 018e3d093ad0..f0a8f1e6a93d 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -727,7 +727,7 @@
set waitfor = 0
while(istype(src, /turf/closed/mineral/gibtonite) && stage == GIBTONITE_ACTIVE && det_time > 0 && mineralAmt >= 1)
det_time--
- sleep(5)
+ sleep(0.5 SECONDS)
if(istype(src, /turf/closed/mineral/gibtonite))
if(stage == GIBTONITE_ACTIVE && det_time <= 0 && mineralAmt >= 1)
var/turf/bombturf = get_turf(src)
diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm
index bde1865380a9..2adcc68ef381 100644
--- a/code/game/turfs/simulated/wall/misc_walls.dm
+++ b/code/game/turfs/simulated/wall/misc_walls.dm
@@ -31,8 +31,8 @@
if(istype(src, /turf/closed/wall/mineral/cult)) //if we haven't changed type
var/previouscolor = color
color = "#FAE48C"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/turf/closed/wall/mineral/cult/artificer
name = "runed stone wall"
@@ -87,8 +87,8 @@
if(istype(src, /turf/closed/wall/clockwork)) //if we haven't changed type
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/turf/closed/wall/clockwork/devastate_wall()
for(var/i in 1 to 2)
@@ -119,14 +119,14 @@
heated = TRUE
hardness = -100 //Lower numbers are tougher, so this makes the wall essentially impervious to smashing
slicing_duration = 170
- animate(realappearance, color = "#FFC3C3", time = 5)
+ animate(realappearance, color = "#FFC3C3", time = 0.5 SECONDS)
else
name = initial(name)
visible_message(span_notice("[src] cools down."))
heated = FALSE
hardness = initial(hardness)
slicing_duration = initial(slicing_duration)
- animate(realappearance, color = initial(realappearance.color), time = 25)
+ animate(realappearance, color = initial(realappearance.color), time = 2.5 SECONDS)
/turf/closed/wall/vault
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 89e97d038643..b4d6338d3235 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -241,7 +241,7 @@ Yogs End*/
//do not convert to timer.
spawn (5)
world.SetConfig("ban", bannedckey, null)
- sleep(1)
+ sleep(0.1 SECONDS)
world.SetConfig("ban", bannedckey, null)
if (!ban["fromdb"])
cachedban = cachedban.Copy() //so old references to the list still see the ban as reverting
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index af97a509eab3..f969bbc261f9 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -786,7 +786,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
log_admin("[key_name_admin(usr)] has initiated a memory dump into \"[fname]\".")
message_admins("[key_name_admin(usr)] has initiated a memory dump into \"[fname]\".")
- sleep(20)
+ sleep(2 SECONDS)
if(!dump_memory_profile("data/logs/memory/[fname]"))
to_chat(usr, span_warning("Dumping memory failed at dll call."))
diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm
index 6ad8eae50607..40925e10355e 100644
--- a/code/modules/admin/ipintel.dm
+++ b/code/modules/admin/ipintel.dm
@@ -99,12 +99,12 @@
else
ipintel_handle_error("Bad intel from server: [response["result"]].", ip, retryed)
if (!retryed)
- sleep(25)
+ sleep(2.5 SECONDS)
return .(ip, 1)
else
ipintel_handle_error("Bad response from server: [response["status"]].", ip, retryed)
if (!retryed)
- sleep(25)
+ sleep(2.5 SECONDS)
return .(ip, 1)
else if (status == 429)
@@ -113,12 +113,12 @@
else
ipintel_handle_error("Unknown status code: [status].", ip, retryed)
if (!retryed)
- sleep(25)
+ sleep(2.5 SECONDS)
return .(ip, 1)
else
ipintel_handle_error("Unable to connect to API.", ip, retryed)
if (!retryed)
- sleep(25)
+ sleep(2.5 SECONDS)
return .(ip, 1)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index abe6b4f77c88..6cda8349b44a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1070,10 +1070,10 @@
for(var/obj/item/I in L)
L.dropItemToGround(I, TRUE)
- L.Unconscious(100)
- sleep(5)
+ L.Unconscious(10 SECONDS)
+ sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdome1))
- spawn(50)
+ spawn(5 SECONDS)
to_chat(L, span_adminnotice("You have been sent to the Thunderdome."))
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 1)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 1)")
@@ -1097,10 +1097,10 @@
for(var/obj/item/I in L)
L.dropItemToGround(I, TRUE)
- L.Unconscious(100)
- sleep(5)
+ L.Unconscious(10 SECONDS)
+ sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdome2))
- spawn(50)
+ spawn(5 SECONDS)
to_chat(L, span_adminnotice("You have been sent to the Thunderdome."))
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 2)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 2)")
@@ -1121,10 +1121,10 @@
return
var/mob/living/L = M
- L.Unconscious(100)
- sleep(5)
+ L.Unconscious(10 SECONDS)
+ sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdomeadmin))
- spawn(50)
+ spawn(5 SECONDS)
to_chat(L, span_adminnotice("You have been sent to the Thunderdome."))
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Admin.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Admin.)")
@@ -1152,10 +1152,10 @@
var/mob/living/carbon/human/observer = L
observer.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket(observer), SLOT_W_UNIFORM)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), SLOT_SHOES)
- L.Unconscious(100)
- sleep(5)
+ L.Unconscious(10 SECONDS)
+ sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdomeobserve))
- spawn(50)
+ spawn(5 SECONDS)
to_chat(L, span_adminnotice("You have been sent to the Thunderdome."))
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Observer.)")
message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Observer.)")
@@ -1285,7 +1285,7 @@
var/client/C = usr.client
if(!isobserver(usr))
C.admin_ghost()
- sleep(2)
+ sleep(0.2 SECONDS)
C.jumptocoord(x,y,z)
else if(href_list["adminchecklaws"])
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index 0974a7dffe40..0525580e7912 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -3,7 +3,7 @@
/proc/_abs(A)
return abs(A)
-/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
+/proc/_animate(atom/A, set_vars, time = 1 SECONDS, loop = 1, easing = LINEAR_EASING, flags = null)
var/mutable_appearance/MA = new()
for(var/v in set_vars)
MA.vars[v] = set_vars[v]
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index e040bd090cef..2c87b06a4b87 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1280,7 +1280,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/mob/living/carbon/chucklenuts = target
playsound(chucklenuts,'sound/misc/thinkfast.ogg',300 , FALSE)
to_chat(chucklenuts, span_warning("Think Fast!"))
- sleep(15)
+ sleep(1.5 SECONDS)
var/obj/item/grenade/flashbang/CB = new/obj/item/grenade/flashbang(target.loc)
CB.prime()
chucklenuts.flash_act()
@@ -1388,7 +1388,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/obj/item/reagent_containers/food/snacks/pie/cream/admin/p = new (get_turf(pick(oview(3,user))))
p.item_flags = UNCATCHABLE
p.throw_at(user, 10, 0.5, usr)
- sleep(5)
+ sleep(0.5 SECONDS)
var/mob/living/carbon/human/T = user
if(!T.IsParalyzed())
var/obj/item/reagent_containers/food/snacks/pie/cream/admin/pie = new (get_turf(pick(oview(1,user))))
@@ -1465,10 +1465,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
playsound(T,'sound/magic/warpwhistle.ogg', 200, 1)
user.mobility_flags &= ~MOBILITY_MOVE
new /obj/effect/temp_visual/tornado(T)
- sleep(20)
+ sleep(2 SECONDS)
user.invisibility = INVISIBILITY_MAXIMUM
user.status_flags |= GODMODE
- sleep(20)
+ sleep(2 SECONDS)
var/breakout = 0
while(breakout < 50)
var/turf/potential_T = find_safe_turf()
@@ -1479,11 +1479,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
break
breakout += 1
new /obj/effect/temp_visual/tornado(T)
- sleep(20)
+ sleep(2 SECONDS)
user.invisibility = initial(user.invisibility)
user.status_flags &= ~GODMODE
user.update_mobility()
- sleep(40)
+ sleep(4 SECONDS)
/datum/admins/proc/cmd_create_wiki()
set category = "Misc"
diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm
index 1466f50fb80e..3e9954cdf977 100644
--- a/code/modules/admin/view_variables/view_variables.dm
+++ b/code/modules/admin/view_variables/view_variables.dm
@@ -78,7 +78,7 @@
if (!islist && !isappearance)
for (var/V in D.vars)
names += V
- sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects.
+ sleep(0.1 SECONDS)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects.
var/list/variable_html = list()
if (islist)
diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm
index c4f311504053..1ac9398b10ab 100644
--- a/code/modules/antagonists/abductor/machinery/experiment.dm
+++ b/code/modules/antagonists/abductor/machinery/experiment.dm
@@ -136,7 +136,7 @@
LAZYADD(history, H)
LAZYADD(abductee_minds, H.mind)
say("Processing specimen...")
- sleep(5)
+ sleep(0.5 SECONDS)
switch(text2num(type))
if(1)
to_chat(H, span_warning("You feel violated."))
@@ -144,7 +144,7 @@
to_chat(H, span_warning("You feel yourself being sliced apart and put back together."))
if(3)
to_chat(H, span_warning("You feel intensely watched."))
- sleep(5)
+ sleep(0.5 SECONDS)
user_abductor.team.abductees += H.mind
H.mind.add_antag_datum(/datum/antagonist/abductee)
@@ -187,4 +187,4 @@
if(state_open)
icon_state = "experiment-open"
else
- icon_state = "experiment"
\ No newline at end of file
+ icon_state = "experiment"
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index ad58b02a96e4..4be0c9c35df1 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -130,7 +130,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
/mob/camera/blob/proc/victory()
sound_to_playing_players('sound/machines/alarm.ogg')
- sleep(100)
+ sleep(10 SECONDS)
for(var/i in GLOB.mob_living_list)
var/mob/living/L = i
var/turf/T = get_turf(L)
diff --git a/code/modules/antagonists/bloodsuckers/powers/targeted/lunge.dm b/code/modules/antagonists/bloodsuckers/powers/targeted/lunge.dm
index 845a2d7b86b4..38a79a2abe87 100644
--- a/code/modules/antagonists/bloodsuckers/powers/targeted/lunge.dm
+++ b/code/modules/antagonists/bloodsuckers/powers/targeted/lunge.dm
@@ -84,17 +84,17 @@
//animate them shake
var/base_x = owner.pixel_x
var/base_y = owner.pixel_y
- animate(owner, pixel_x = base_x, pixel_y = base_y, time = 1, loop = -1)
+ animate(owner, pixel_x = base_x, pixel_y = base_y, time = 0.1 SECONDS, loop = -1)
for(var/i in 1 to 25)
var/x_offset = base_x + rand(-3, 3)
var/y_offset = base_y + rand(-3, 3)
- animate(pixel_x = x_offset, pixel_y = y_offset, time = 1)
+ animate(pixel_x = x_offset, pixel_y = y_offset, time = 0.1 SECONDS)
if(!do_after(owner, 4 SECONDS, extra_checks = CALLBACK(src, .proc/CheckCanTarget, target_atom)))
- animate(owner, pixel_x = base_x, pixel_y = base_y, time = 1)
+ animate(owner, pixel_x = base_x, pixel_y = base_y, time = 0.1 SECONDS)
casting = FALSE
return FALSE
- animate(owner, pixel_x = base_x, pixel_y = base_y, time = 1)
+ animate(owner, pixel_x = base_x, pixel_y = base_y, time = 0.1 SECONDS)
casting = FALSE
return TRUE
@@ -172,4 +172,4 @@
. = ..()
var/mob/living/carbon/target = hit_atom
if(target.m_intent != MOVE_INTENT_WALK)
- target.toggle_move_intent()
\ No newline at end of file
+ target.toggle_move_intent()
diff --git a/code/modules/antagonists/bloodsuckers/powers/targeted/trespass.dm b/code/modules/antagonists/bloodsuckers/powers/targeted/trespass.dm
index a3dfba53991a..93c82f96c3fd 100644
--- a/code/modules/antagonists/bloodsuckers/powers/targeted/trespass.dm
+++ b/code/modules/antagonists/bloodsuckers/powers/targeted/trespass.dm
@@ -15,7 +15,7 @@
//target_range = 2
var/turf/target_turf // We need to decide where we're going based on where we clicked. It's not actually the tile we clicked.
var/wallbound = TRUE
- var/soliddelay = 1
+ var/soliddelay = 0.1 SECONDS
/datum/action/bloodsucker/targeted/trespass/CheckCanUse(mob/living/carbon/user)
. = ..()
@@ -121,4 +121,4 @@
button_icon_state = "power_manifest"
additional_text = "Additionally allows you pass through walls, albeit at a slower rate."
purchase_flags = LASOMBRA_CAN_BUY
- wallbound = FALSE
\ No newline at end of file
+ wallbound = FALSE
diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm
index 4cad5f523e95..3bf89b14465b 100644
--- a/code/modules/antagonists/changeling/powers/headcrab.dm
+++ b/code/modules/antagonists/changeling/powers/headcrab.dm
@@ -37,7 +37,7 @@
H?.leave_victim()
user.gib()
. = TRUE
- sleep(5) // So it's not killed in explosion
+ sleep(0.5 SECONDS) // So it's not killed in explosion
var/mob/living/simple_animal/hostile/headcrab/crab = new(turf)
for(var/obj/item/organ/I in organs)
I.forceMove(crab)
diff --git a/code/modules/antagonists/changeling/powers/linglink.dm b/code/modules/antagonists/changeling/powers/linglink.dm
index 34711f22b7fe..eb9cb373aa4b 100644
--- a/code/modules/antagonists/changeling/powers/linglink.dm
+++ b/code/modules/antagonists/changeling/powers/linglink.dm
@@ -58,7 +58,7 @@
target.say("[MODE_TOKEN_CHANGELING] AAAAARRRRGGGGGHHHHH!!")
to_chat(target, "You can now communicate in the changeling hivemind, say \"[MODE_TOKEN_CHANGELING] message\" to communicate!")
target.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 40) // So they don't choke to death while you interrogate them
- sleep(1800)
+ sleep(3 MINUTES)
SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]", "[i]"))
if(!do_mob(user, target, 20))
to_chat(user, span_warning("Our link with [target] has ended!"))
diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm
index 4eb11e169eb3..c321a73a85fa 100644
--- a/code/modules/antagonists/changeling/powers/strained_muscles.dm
+++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm
@@ -46,7 +46,7 @@
if(stacks == 11) //Warning message that the stacks are getting too high
to_chat(user, span_warning("Our legs are really starting to hurt..."))
- sleep(40)
+ sleep(4 SECONDS)
//yogs start - removes speed buff when not active
while(!active)
@@ -56,4 +56,4 @@
while(!active && stacks) //Damage stacks decrease fairly rapidly while not in sanic mode
stacks--
- sleep(20)
+ sleep(2 SECONDS)
diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
index 07fec9aacb41..ee594dd08594 100644
--- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
@@ -103,7 +103,7 @@
light_color = "#FAE48C"
stat_affected = UNCONSCIOUS
resist_string = "glows faintly yellow"
- var/convert_time = 80
+ var/convert_time = 8 SECONDS
var/delete_on_finish = TRUE
sigil_name = "Sigil of Submission"
var/glow_type = /obj/effect/temp_visual/ratvar/sigil/submission
@@ -133,7 +133,7 @@
if(get_turf(L) != get_turf(src))
if(glow)
qdel(glow)
- animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW)
+ animate(src, color = oldcolor, time = 2 SECONDS, flags = ANIMATION_END_NOW)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20)
visible_message(span_warning("[src] slowly stops glowing!"))
return
@@ -161,7 +161,7 @@
to_chat(M, "[span_heavy_brass("[message] you!")]")
else
to_chat(M, "[span_heavy_brass("[message] [L.real_name]!")]")
- animate(src, color = oldcolor, time = 20, flags = ANIMATION_END_NOW)
+ animate(src, color = oldcolor, time = 2 SECONDS, flags = ANIMATION_END_NOW)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 20)
visible_message(span_warning("[src] slowly stops glowing!"))
@@ -220,8 +220,8 @@
var/previous_color = cyborg.color
cyborg.color = list("#EC8A2D", "#EC8A2D", "#EC8A2D", rgb(0,0,0))
cyborg.apply_status_effect(STATUS_EFFECT_POWERREGEN, giving_power * 0.1) //ten ticks, restoring 10% each
- animate(cyborg, color = previous_color, time = 100)
- addtimer(CALLBACK(cyborg, /atom/proc/update_atom_colour), 100)
+ animate(cyborg, color = previous_color, time = 10 SECONDS)
+ addtimer(CALLBACK(cyborg, /atom/proc/update_atom_colour), 10 SECONDS)
/obj/effect/clockwork/sigil/transmission/proc/cyborg_checks(mob/living/silicon/robot/cyborg, silent)
if(!cyborg.cell)
@@ -285,8 +285,8 @@
/obj/effect/clockwork/sigil/vitality/sigil_effects(mob/living/L)
if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active)
return
- animate(src, alpha = 255, time = 10, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
- sleep(10)
+ animate(src, alpha = 255, time = 1 SECONDS, flags = ANIMATION_END_NOW) //we may have a previous animation going. finish it first, then do this one without delay.
+ sleep(1 SECONDS)
//as long as they're still on the sigil and are either not a servant or they're a servant AND it has remaining vitality
var/consumed_vitality
while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && (GLOB.ratvar_awakens || GLOB.clockwork_vitality))) && get_turf(L) == get_turf(src) && !L.buckled)
@@ -301,7 +301,7 @@
consumed_vitality = TRUE //Prevent the target from being consumed multiple times
vitality_drained = L.maxHealth
var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
- animate(V, alpha = 0, transform = matrix()*2, time = 8)
+ animate(V, alpha = 0, transform = matrix()*2, time = 0.8 SECONDS)
playsound(L, 'sound/magic/wandodeath.ogg', 50, 1)
L.visible_message(span_warning("[L] collapses in on [L.p_them()]self as [src] flares bright blue!"))
to_chat(L, "[span_inathneq_large("\"[text2ratvar("Your life will not be wasted.")]\"")]")
@@ -335,7 +335,7 @@
ghost.reenter_corpse()
L.revive(1, 1)
var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
- animate(V, alpha = 0, transform = matrix()*2, time = 8)
+ animate(V, alpha = 0, transform = matrix()*2, time = 0.8 SECONDS)
playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
to_chat(L, span_inathneq("\"[text2ratvar("You will be okay, child.")]\""))
L.apply_status_effect(STATUS_EFFECT_ICHORIAL_STAIN)
@@ -351,7 +351,7 @@
L.ghostize(0)
L.key = C.key
var/obj/effect/temp_visual/ratvar/sigil/vitality/V = new /obj/effect/temp_visual/ratvar/sigil/vitality(get_turf(src))
- animate(V, alpha = 0, transform = matrix()*2, time = 8)
+ animate(V, alpha = 0, transform = matrix()*2, time = 0.8 SECONDS)
playsound(L, 'sound/magic/staff_healing.ogg', 50, 1)
L.visible_message(span_warning("[L]'s eyes suddenly open wide, gleaming with renewed vigor for the cause!"), span_inathneq("\"[text2ratvar("Awaken!")]\""))
break
@@ -368,9 +368,9 @@
if(!GLOB.ratvar_awakens)
GLOB.clockwork_vitality -= vitality_used
- sleep(2)
+ sleep(0.2 SECONDS)
if(sigil_active)
animation_number = initial(animation_number)
sigil_active = FALSE
- animate(src, alpha = initial(alpha), time = 10, flags = ANIMATION_END_NOW)
+ animate(src, alpha = initial(alpha), time = 1 SECONDS, flags = ANIMATION_END_NOW)
diff --git a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
index 80ae8996f746..94c765690282 100644
--- a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
@@ -8,8 +8,8 @@
/obj/effect/clockwork/general_marker/Initialize()
. = ..()
- animate(src, alpha = 0, time = 10)
- QDEL_IN(src, 10)
+ animate(src, alpha = 0, time = 1 SECONDS)
+ QDEL_IN(src, 1 SECONDS)
/obj/effect/clockwork/general_marker/singularity_act()
return
diff --git a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
index db9e65d50a54..e60aec4c68c8 100644
--- a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
@@ -100,14 +100,14 @@
if(severity == 1 && uses)
uses = 0
visible_message(span_warning("[src] is disrupted!"))
- animate(src, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW)
+ animate(src, alpha = 0, transform = matrix()*2, time = 1 SECONDS, flags = ANIMATION_END_NOW)
deltimer(timerid)
- timerid = QDEL_IN(src, 10)
+ timerid = QDEL_IN(src, 1 SECONDS)
linked_gateway.uses = 0
linked_gateway.visible_message(span_warning("[linked_gateway] is disrupted!"))
- animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 10, flags = ANIMATION_END_NOW)
+ animate(linked_gateway, alpha = 0, transform = matrix()*2, time = 1 SECONDS, flags = ANIMATION_END_NOW)
deltimer(linked_gateway.timerid)
- linked_gateway.timerid = QDEL_IN(linked_gateway, 10)
+ linked_gateway.timerid = QDEL_IN(linked_gateway, 1 SECONDS)
return TRUE
return FALSE
@@ -152,14 +152,14 @@
uses = max(0, uses - 1)
linked_gateway.uses = max(0, linked_gateway.uses - 1)
if(!uses)
- animate(src, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW)
+ animate(src, transform = matrix() * 0.1, time = 1 SECONDS, flags = ANIMATION_END_NOW)
animate(linked_gateway, transform = matrix() * 0.1, time = 10, flags = ANIMATION_END_NOW)
density = FALSE
linked_gateway.density = FALSE
else
- animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
- animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
- addtimer(CALLBACK(src, .proc/check_uses), 10)
+ animate(src, transform = matrix() / 1.5, time = 1 SECONDS, flags = ANIMATION_END_NOW)
+ animate(linked_gateway, transform = matrix() / 1.5, time = 1 SECONDS, flags = ANIMATION_END_NOW)
+ addtimer(CALLBACK(src, .proc/check_uses), 1 SECONDS)
return TRUE
/obj/effect/clockwork/spatial_gateway/proc/check_uses()
diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
index ee284bfc28f4..edd0488b5cd9 100644
--- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
@@ -175,14 +175,14 @@
for(var/mob/living/carbon/C in range(1, src))
var/datum/status_effect/belligerent/B = C.apply_status_effect(STATUS_EFFECT_BELLIGERENT)
if(!QDELETED(B))
- B.duration = world.time + 30
- C.Paralyze(5) //knocks down for half a second if affected
- sleep(!GLOB.ratvar_approaches ? 16 : 10)
+ B.duration = world.time + 3 SECONDS
+ C.Paralyze(0.5 SECONDS) //knocks down for half a second if affected
+ sleep(!GLOB.ratvar_approaches ? 1.6 SECONDS : 1 SECONDS)
name = "judicial blast"
layer = ABOVE_ALL_MOB_LAYER
flick("judicial_explosion", src)
set_light(1.4, 2, "#B451A1")
- sleep(13)
+ sleep(1.3 SECONDS)
name = "judicial explosion"
var/targetsjudged = 0
playsound(src, 'sound/effects/explosion_distant.ogg', 100, 1, 1, 1)
diff --git a/code/modules/antagonists/clockcult/clock_scripture.dm b/code/modules/antagonists/clockcult/clock_scripture.dm
index c1fc555cb8f4..167b617c66e6 100644
--- a/code/modules/antagonists/clockcult/clock_scripture.dm
+++ b/code/modules/antagonists/clockcult/clock_scripture.dm
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(scripture_states,scripture_states_init_value()) //list of clock
var/desc = "Ancient Ratvarian lore. This piece seems particularly mundane."
var/list/invocations = list() //Spoken over time in the ancient language of Ratvar. See clock_unsorted.dm for more details on the language and how to make it.
var/chanting = FALSE //If the invocation's words are being spoken
- var/channel_time = 10 //In deciseconds, how long a ritual takes to chant
+ var/channel_time = 1 SECONDS //In seconds, how long a ritual takes to chant
var/power_cost = 5 //In watts, how much a scripture takes to invoke
var/special_power_text //If the scripture can use additional power to have a unique function, use this; put POWERCOST here to display the special power cost.
var/special_power_cost //This should be a define in __DEFINES/clockcult.dm, such as ABSCOND_ABDUCTION_COST
diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
index d1b1edbf6903..047bf1d5246a 100644
--- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
+++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
@@ -195,7 +195,7 @@
/datum/clockwork_scripture/abscond/recital()
client_color = invoker.client.color
- animate(invoker.client, color = "#AF0AAF", time = 50)
+ animate(invoker.client, color = "#AF0AAF", time = 5 SECONDS)
. = ..()
/datum/clockwork_scripture/abscond/scripture_effects()
@@ -213,11 +213,11 @@
invoker.pulling.forceMove(T)
invoker.forceMove(T)
if(invoker.client)
- animate(invoker.client, color = client_color, time = 25)
+ animate(invoker.client, color = client_color, time = 2.5 SECONDS)
/datum/clockwork_scripture/abscond/scripture_fail()
if(invoker && invoker.client)
- animate(invoker.client, color = client_color, time = 10)
+ animate(invoker.client, color = client_color, time = 1 SECONDS)
//Replicant: Creates a new clockwork slab.
diff --git a/code/modules/antagonists/clockcult/clock_structure.dm b/code/modules/antagonists/clockcult/clock_structure.dm
index fa38a2a90baa..58277544cb0c 100644
--- a/code/modules/antagonists/clockcult/clock_structure.dm
+++ b/code/modules/antagonists/clockcult/clock_structure.dm
@@ -36,8 +36,8 @@
if(take_damage(rand(25, 50), BRUTE) && src) //if we still exist
var/previouscolor = color
color = "#960000"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/obj/structure/destructible/clockwork/examine(mob/user)
var/can_see_clockwork = is_servant_of_ratvar(user) || isobserver(user)
diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
index fc882f3eb545..9814f4c8ad0b 100644
--- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -150,7 +150,7 @@
recalls_remaining--
recalling = FALSE
transform = matrix() * 2
- animate(src, transform = matrix() * 0.5, time = 30, flags = ANIMATION_END_NOW)
+ animate(src, transform = matrix() * 0.5, time = 3 SECONDS, flags = ANIMATION_END_NOW)
/obj/structure/destructible/clockwork/massive/celestial_gateway/Destroy()
STOP_PROCESSING(SSprocessing, src)
@@ -197,7 +197,7 @@
make_glow()
glow.icon_state = "clockwork_gateway_disrupted"
resistance_flags |= INDESTRUCTIBLE
- sleep(27)
+ sleep(2.7 SECONDS)
explosion(src, 1, 3, 8, 8)
sound_to_playing_players('sound/effects/explosion_distant.ogg', volume = 50)
qdel(src)
@@ -336,13 +336,13 @@
resistance_flags |= INDESTRUCTIBLE
purpose_fulfilled = TRUE
make_glow()
- animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125)
+ animate(glow, transform = matrix() * 1.5, alpha = 255, time = 12.5 SECONDS)
sound_to_playing_players(volume = 100, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/ratvar_rises.ogg')) //End the sounds
- sleep(125)
+ sleep(12.5 SECONDS)
make_glow()
- animate(glow, transform = matrix() * 3, alpha = 0, time = 5)
- QDEL_IN(src, 3)
- sleep(3)
+ animate(glow, transform = matrix() * 3, alpha = 0, time = 0.5 SECONDS)
+ QDEL_IN(src, 0.3 SECONDS)
+ sleep(0.3 SECONDS)
GLOB.clockwork_gateway_activated = TRUE
var/turf/T = SSmapping.get_station_center()
new /obj/structure/destructible/clockwork/massive/ratvar(T)
diff --git a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
index c95a8c67cb5c..70621f5245f7 100644
--- a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
@@ -116,7 +116,7 @@
var/base_victory_chance = 1
while(src && narsie)
sound_to_playing_players('sound/magic/clockwork/ratvar_attack.ogg')
- sleep(5.2)
+ sleep(0.52 SECONDS)
for(var/mob/M in GLOB.mob_list)
if(!isnewplayer(M))
flash_color(M, flash_color="#966400", flash_time=1)
@@ -128,9 +128,9 @@
if(ratvar_chance > narsie_chance)
winner = "Ratvar"
break
- sleep(rand(2,5))
+ sleep(rand(0.2 SECONDS, 0.5 SECONDS))
sound_to_playing_players('sound/magic/clockwork/narsie_attack.ogg')
- sleep(7.4)
+ sleep(0.74 SECONDS)
for(var/mob/M in GLOB.mob_list)
if(!isnewplayer(M))
flash_color(M, flash_color="#C80000", flash_time=1)
diff --git a/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm b/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm
index 9c4aec396983..8be3334257f7 100644
--- a/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm
@@ -27,7 +27,7 @@
qdel(TT)
setDir(pick(GLOB.cardinals))
transform = matrix()*1.3
- animate(src, alpha = 100, time = 15)
+ animate(src, alpha = 100, time = 1.5 SECONDS)
/obj/structure/destructible/clockwork/taunting_trail/Destroy()
deltimer(timerid)
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
index 196e686faf96..b0afee091d7a 100644
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ b/code/modules/antagonists/cult/cult_comms.dm
@@ -95,7 +95,7 @@
if(!B.current.incapacitated())
SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg')
to_chat(B.current, span_cultlarge("Acolyte [Nominee] has asserted that [Nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly."))
- sleep(100)
+ sleep(10 SECONDS)
var/list/asked_cultists = list()
for(var/datum/mind/B in team.members)
if(B.current && B.current != Nominee && !B.current.incapacitated())
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 8b4847e976e2..5d9302ea6967 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -115,7 +115,7 @@
var/datum/action/innate/dash/cult/jaunt
var/datum/action/innate/cult/spin2win/linked_action
var/spinning = FALSE
- var/spin_cooldown = 250
+ var/spin_cooldown = 25 SECONDS
var/dash_toggled = TRUE
/obj/item/twohanded/required/cult_bastard/Initialize()
@@ -537,7 +537,7 @@ GLOBAL_VAR_INIT(curselimit, 0)
to_chat(user, span_danger("You shatter the orb! A dark essence spirals into the air, then disappears."))
playsound(user.loc, 'sound/effects/glassbr1.ogg', 50, 1)
qdel(src)
- sleep(20)
+ sleep(2 SECONDS)
var/curses = list("A fuel technician just slit his own throat and begged for death.",
"The shuttle's navigation programming was replaced by a file containing just two words: IT COMES.",
"The shuttle's custodian was found washing the windows with their own blood.",
@@ -859,7 +859,7 @@ GLOBAL_VAR_INIT(curselimit, 0)
if(!charging)
break
if(i > 1)
- sleep(15)
+ sleep(1.5 SECONDS)
if(i < 4)
O = new /obj/effect/temp_visual/cult/rune_spawn/rune1/inner(user.loc, 30, "#ff0000")
else
@@ -878,7 +878,7 @@ GLOBAL_VAR_INIT(curselimit, 0)
set_angle = angle - spread
spread -= 8
else
- sleep(15)
+ sleep(1.5 SECONDS)
set_angle = angle + spread
second = !second //Handles beam firing in pairs
if(!firing)
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index 5e23bf1e0a23..593d58f3b196 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -79,8 +79,8 @@
if(take_damage(rand(25, 50), BURN) && src) //if we still exist
var/previouscolor = color
color = "#FAE48C"
- animate(src, color = previouscolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
+ animate(src, color = previouscolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
/obj/structure/destructible/cult/talisman
@@ -387,7 +387,7 @@
pillars += new /obj/structure/destructible/cult/pillar(T3)
var/turf/T4 = locate(x+2,y+2,z)
pillars += new /obj/structure/destructible/cult/pillar/alt(T4)
- sleep(10)
+ sleep(1 SECONDS)
icon_state = "bloodstone-enter3"
for(var/mob/M in GLOB.player_list)
if (M.z == z && M.client)
@@ -403,7 +403,7 @@
/obj/structure/destructible/cult/bloodstone/proc/summon()
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF //should stop the stone from being destroyed by damage
sound_to_playing_players('sound/effects/dimensional_rend.ogg')
- sleep(40)
+ sleep(4 SECONDS)
new /obj/singularity/narsie/large/cult(loc)
/obj/structure/destructible/cult/bloodstone/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration = 0)
@@ -483,22 +483,22 @@
set_light(3+current_fullness, 2+current_fullness)
/obj/structure/destructible/cult/bloodstone/proc/set_animate()
- animate(src, color = list(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1,0,0,0,0), time = 10, loop = -1)
- animate(color = list(1.125,0.06,0,0,0,1.125,0.06,0,0.06,0,1.125,0,0,0,0,1,0,0,0,0), time = 2)
- animate(color = list(1.25,0.12,0,0,0,1.25,0.12,0,0.12,0,1.25,0,0,0,0,1,0,0,0,0), time = 2)
- animate(color = list(1.375,0.19,0,0,0,1.375,0.19,0,0.19,0,1.375,0,0,0,0,1,0,0,0,0), time = 1.5)
- animate(color = list(1.5,0.27,0,0,0,1.5,0.27,0,0.27,0,1.5,0,0,0,0,1,0,0,0,0), time = 1.5)
- animate(color = list(1.625,0.35,0.06,0,0.06,1.625,0.35,0,0.35,0.06,1.625,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.75,0.45,0.12,0,0.12,1.75,0.45,0,0.45,0.12,1.75,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.875,0.56,0.19,0,0.19,1.875,0.56,0,0.56,0.19,1.875,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(2,0.67,0.27,0,0.27,2,0.67,0,0.67,0.27,2,0,0,0,0,1,0,0,0,0), time = 5)
- animate(color = list(1.875,0.56,0.19,0,0.19,1.875,0.56,0,0.56,0.19,1.875,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.75,0.45,0.12,0,0.12,1.75,0.45,0,0.45,0.12,1.75,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.625,0.35,0.06,0,0.06,1.625,0.35,0,0.35,0.06,1.625,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.5,0.27,0,0,0,1.5,0.27,0,0.27,0,1.5,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.375,0.19,0,0,0,1.375,0.19,0,0.19,0,1.375,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.25,0.12,0,0,0,1.25,0.12,0,0.12,0,1.25,0,0,0,0,1,0,0,0,0), time = 1)
- animate(color = list(1.125,0.06,0,0,0,1.125,0.06,0,0.06,0,1.125,0,0,0,0,1,0,0,0,0), time = 1)
+ animate(src, color = list(1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1,0,0,0,0), time = 1 SECONDS, loop = -1)
+ animate(color = list(1.125,0.06,0,0,0,1.125,0.06,0,0.06,0,1.125,0,0,0,0,1,0,0,0,0), time = 0.2 SECONDS)
+ animate(color = list(1.25,0.12,0,0,0,1.25,0.12,0,0.12,0,1.25,0,0,0,0,1,0,0,0,0), time = 0.2 SECONDS)
+ animate(color = list(1.375,0.19,0,0,0,1.375,0.19,0,0.19,0,1.375,0,0,0,0,1,0,0,0,0), time = 0.15 SECONDS)
+ animate(color = list(1.5,0.27,0,0,0,1.5,0.27,0,0.27,0,1.5,0,0,0,0,1,0,0,0,0), time = 0.15 SECONDS)
+ animate(color = list(1.625,0.35,0.06,0,0.06,1.625,0.35,0,0.35,0.06,1.625,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.75,0.45,0.12,0,0.12,1.75,0.45,0,0.45,0.12,1.75,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.875,0.56,0.19,0,0.19,1.875,0.56,0,0.56,0.19,1.875,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(2,0.67,0.27,0,0.27,2,0.67,0,0.67,0.27,2,0,0,0,0,1,0,0,0,0), time = 0.5 SECONDS)
+ animate(color = list(1.875,0.56,0.19,0,0.19,1.875,0.56,0,0.56,0.19,1.875,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.75,0.45,0.12,0,0.12,1.75,0.45,0,0.45,0.12,1.75,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.625,0.35,0.06,0,0.06,1.625,0.35,0,0.35,0.06,1.625,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.5,0.27,0,0,0,1.5,0.27,0,0.27,0,1.5,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.375,0.19,0,0,0,1.375,0.19,0,0.19,0,1.375,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.25,0.12,0,0,0,1.25,0.12,0,0.12,0,1.25,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
+ animate(color = list(1.125,0.06,0,0,0,1.125,0.06,0,0.06,0,1.125,0,0,0,0,1,0,0,0,0), time = 0.1 SECONDS)
set_light(20, 20)
update_icon()
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index caf32a270425..749b8c30e700 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -158,17 +158,17 @@ structure_check() searches for nearby cultist structures required for the invoca
/obj/effect/rune/proc/do_invoke_glow()
set waitfor = FALSE
- animate(src, transform = matrix()*2, alpha = 0, time = 5, flags = ANIMATION_END_NOW) //fade out
- sleep(5)
- animate(src, transform = matrix(), alpha = 255, time = 0, flags = ANIMATION_END_NOW)
+ animate(src, transform = matrix()*2, alpha = 0, time = 0.5 SECONDS, flags = ANIMATION_END_NOW) //fade out
+ sleep(0.5 SECONDS)
+ animate(src, transform = matrix(), alpha = 255, time = 0 SECONDS, flags = ANIMATION_END_NOW)
/obj/effect/rune/proc/fail_invoke()
//This proc contains the effects of a rune if it is not invoked correctly, through either invalid wording or not enough cultists. By default, it's just a basic fizzle.
visible_message(span_warning("The markings pulse with a small flash of red light, then fall dark."))
var/oldcolor = color
color = rgb(255, 0, 0)
- animate(src, color = oldcolor, time = 5)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 5)
+ animate(src, color = oldcolor, time = 0.5 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.5 SECONDS)
//Malformed Rune: This forms if a rune is not drawn correctly. Invoking it does nothing but hurt the user.
/obj/effect/rune/malformed
@@ -237,8 +237,8 @@ structure_check() searches for nearby cultist structures required for the invoca
invocation = "Barhah hra zar'garis!"
..()
do_sacrifice(L, invokers)
- animate(src, color = oldcolor, time = 5)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 5)
+ animate(src, color = oldcolor, time = 0.5 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.5 SECONDS)
Cult_team.check_size() // Triggers the eye glow or aura effects if the cult has grown large enough relative to the crew
rune_in_use = FALSE
@@ -541,7 +541,7 @@ structure_check() searches for nearby cultist structures required for the invoca
used = TRUE
..()
sound_to_playing_players('sound/magic/clockwork/narsie_attack.ogg', volume = 100)
- sleep(20)
+ sleep(2 SECONDS)
if(src)
color = RUNE_COLOR_RED
SSticker.mode.begin_bloodstone_phase() //activate the FINAL STAGE
@@ -713,8 +713,8 @@ structure_check() searches for nearby cultist structures required for the invoca
update_state()
var/oldcolor = color
add_atom_colour("#696969", FIXED_COLOUR_PRIORITY)
- animate(src, color = oldcolor, time = 100, easing = EASE_IN) //yogs: 10 seconds instead of 5
- addtimer(CALLBACK(src, .proc/recharge), 100)
+ animate(src, color = oldcolor, time = 10 SECONDS, easing = EASE_IN) //yogs: 10 seconds instead of 5
+ addtimer(CALLBACK(src, .proc/recharge), 10 SECONDS)
/obj/effect/rune/wall/proc/recharge()
recharging = FALSE
@@ -829,18 +829,18 @@ structure_check() searches for nearby cultist structures required for the invoca
to_chat(L, span_cultlarge("Your blood boils in your veins!"))
if(is_servant_of_ratvar(L))
to_chat(L, span_userdanger("You feel an unholy darkness dimming the Justiciar's light!"))
- animate(src, color = "#FCB56D", time = 4)
- sleep(4)
+ animate(src, color = "#FCB56D", time = 0.4 SECONDS)
+ sleep(0.4 SECONDS)
if(QDELETED(src))
return
do_area_burn(T, 0.5)
- animate(src, color = "#FFDF80", time = 5)
- sleep(5)
+ animate(src, color = "#FFDF80", time = 0.5 SECONDS)
+ sleep(0.5 SECONDS)
if(QDELETED(src))
return
do_area_burn(T, 1)
- animate(src, color = "#FFFDF4", time = 6)
- sleep(6)
+ animate(src, color = "#FFFDF4", time = 0.6 SECONDS)
+ sleep(0.6 SECONDS)
if(QDELETED(src))
return
do_area_burn(T, 1.5)
@@ -932,7 +932,7 @@ structure_check() searches for nearby cultist structures required for the invoca
if(user.stat || new_human.InCritical())
break
user.apply_damage(0.1, BRUTE)
- sleep(1)
+ sleep(0.1 SECONDS)
qdel(N)
ghosts--
@@ -957,17 +957,17 @@ structure_check() searches for nearby cultist structures required for the invoca
while(!QDELETED(affecting))
if(!(affecting in T))
user.visible_message(span_warning("A spectral tendril wraps around [affecting] and pulls [affecting.p_them()] back to the rune!"))
- Beam(affecting, icon_state="drainbeam", time=2)
+ Beam(affecting, icon_state="drainbeam", time=0.2 SECONDS)
affecting.forceMove(get_turf(src)) //NO ESCAPE :^)
if(affecting.key)
affecting.visible_message(span_warning("[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming."), \
span_danger("You are re-united with your physical form. [src] releases its hold over you."))
- affecting.Paralyze(40)
+ affecting.Paralyze(4 SECONDS)
break
if(affecting.health <= 10)
to_chat(G, span_cultitalic("Your body can no longer sustain the connection!"))
break
- sleep(5)
+ sleep(0.5 SECONDS)
CM.Remove(G)
GM.Remove(G)
affecting.remove_atom_colour(ADMIN_COLOUR_PRIORITY, RUNE_COLOR_DARKRED)
@@ -1109,15 +1109,15 @@ structure_check() searches for nearby cultist structures required for the invoca
while(end>world.time)
for(var/image/I in images)
I.override = FALSE
- animate(I, alpha = 0, time = 25, flags = ANIMATION_PARALLEL)
- sleep(35)
+ animate(I, alpha = 0, time = 2.5 SECONDS, flags = ANIMATION_PARALLEL)
+ sleep(3.5 SECONDS)
for(var/image/I in images)
- animate(I, alpha = 255, time = 25, flags = ANIMATION_PARALLEL)
- sleep(25)
+ animate(I, alpha = 255, time = 2.5 SECONDS, flags = ANIMATION_PARALLEL)
+ sleep(2.5 SECONDS)
for(var/image/I in images)
if(I.icon_state != "bloodsparkles")
I.override = TRUE
- sleep(190)
+ sleep(19 SECONDS)
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
index 4ebeb1c6c217..e70c5199bcc3 100644
--- a/code/modules/antagonists/devil/devil.dm
+++ b/code/modules/antagonists/devil/devil.dm
@@ -11,7 +11,7 @@
#define SOULVALUE soulsOwned.len-reviveNumber
-#define DEVILRESURRECTTIME 600
+#define DEVILRESURRECTTIME 60 SECONDS
GLOBAL_LIST_EMPTY(allDevils)
GLOBAL_LIST_INIT(lawlorify, list (
@@ -235,7 +235,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
/datum/antagonist/devil/proc/increase_blood_lizard()
to_chat(owner.current, span_warning("You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard."))
- sleep(50)
+ sleep(5 SECONDS)
if(ishuman(owner.current))
var/mob/living/carbon/human/H = owner.current
H.set_species(/datum/species/lizard, 1)
@@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
/datum/antagonist/devil/proc/increase_true_devil()
to_chat(owner.current, span_warning("You feel as though your current form is about to shed. You will soon turn into a true devil."))
- sleep(50)
+ sleep(5 SECONDS)
var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc)
A.faction |= "hell"
owner.current.forceMove(A)
@@ -269,34 +269,34 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
return
var/mob/living/carbon/true_devil/D = owner.current
to_chat(D, span_warning("You feel as though your form is about to ascend."))
- sleep(50)
+ sleep(5 SECONDS)
if(!D)
return
D.visible_message(span_warning("[D]'s skin begins to erupt with spikes."), \
span_warning("Your flesh begins creating a shield around yourself."))
- sleep(100)
+ sleep(10 SECONDS)
if(!D)
return
D.visible_message(span_warning("The horns on [D]'s head slowly grow and elongate."), \
span_warning("Your body continues to mutate. Your telepathic abilities grow."))
- sleep(90)
+ sleep(9 SECONDS)
if(!D)
return
D.visible_message(span_warning("[D]'s body begins to violently stretch and contort."), \
span_warning("You begin to rend apart the final barriers to ultimate power."))
- sleep(40)
+ sleep(4 SECONDS)
if(!D)
return
to_chat(D, "Yes!")
- sleep(10)
+ sleep(1 SECONDS)
if(!D)
return
to_chat(D, "[span_big("YES!!")]")
- sleep(10)
+ sleep(1 SECONDS)
if(!D)
return
to_chat(D, "[span_reallybig("YE--")]")
- sleep(1)
+ sleep(0.1 SECONDS)
if(!D)
return
send_to_playing_players("\"SLOTH, WRATH, GLUTTONY, ACEDIA, ENVY, GREED, PRIDE! FIRES OF HELL AWAKEN!!\"")
@@ -308,7 +308,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
var/area/A = get_area(owner.current)
if(A)
notify_ghosts("An arch devil has ascended in \the [A.name]. Reach out to the devil to be given a new shell for your soul.", source = owner.current, action=NOTIFY_ATTACK)
- sleep(50)
+ sleep(5 SECONDS)
if(!SSticker.mode.devil_ascended)
SSshuttle.emergency.request(null, set_coefficient = 0.3)
SSticker.mode.devil_ascended++
@@ -510,7 +510,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
var/mob/living/silicon/robot_devil = owner.current
var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][ban], GLOB.lawlorify[LAW][obligation], "Accomplish your objectives at all costs.")
robot_devil.set_law_sixsixsix(laws)
- sleep(10)
+ sleep(1 SECONDS)
if(owner.assigned_role == "Clown" && ishuman(owner.current))
var/mob/living/carbon/human/S = owner.current
to_chat(S, span_notice("Your infernal nature has allowed you to overcome your clownishness."))
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm
index 4a94ff8456b5..188363e01a07 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm
@@ -231,7 +231,7 @@
human_user.safe_throw_at(throwtarget, rand(1,20), 1, src, force = MOVE_FORCE_OVERPOWERING , quickstart = TRUE)
human_user.Shake(rand(-100,100), rand(-100,100), 110) //oh we are TOTALLY stacking these //turns out we are not in fact stacking these
to_chat(user, span_userdanger("[pick("I- I- I-", "NO-", "IT HURTS-", "GETOUTOFMYHEADGETOUTOFMY-", "POD-","COVE-", "AAAAAAAAA-")]"))
- sleep(1.1) //Spooky flavor message spam
+ sleep(0.11 SECONDS) //Spooky flavor message spam
to_chat(user, span_cultbold("That was a really bad idea..."))
human_user.ghostize()
var/obj/item/bodypart/head/head = locate() in human_user.bodyparts
@@ -398,7 +398,7 @@
owner.blood_volume = 0
owner.death()
penance_sources[P] --
- sleep(2)
+ sleep(0.2 SECONDS)
/datum/status_effect/brazil_penance/on_remove()
. = ..()
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
index d8915c77a96c..f904ab86d2dd 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
@@ -358,7 +358,7 @@
continue
hit_list += M
M.take_damage(45, BURN, MELEE, 1)
- sleep(1.5)
+ sleep(0.15 SECONDS)
/obj/effect/proc_holder/spell/targeted/shapeshift/eldritch
invocation = "BEND MY FORM"
@@ -411,7 +411,7 @@
for(var/mob/living/livies in T.contents - centre)
livies.adjustFireLoss(5)
_range++
- sleep(3)
+ sleep(0.3 SECONDS)
/obj/effect/proc_holder/spell/aoe_turf/fire_cascade/big
range = 6
diff --git a/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm b/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm
index 8b554b5095cc..81cf3be09c18 100644
--- a/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm
+++ b/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm
@@ -337,7 +337,7 @@
for(var/turf/open/t in range(1, B))
if(prob(60) && B.Adjacent(t))
t.MakeSlippery(TURF_WET_LUBE, 100)
- sleep(5)
+ sleep(0.5 SECONDS)
spins_remaining--
if(!B.can_use_ability())
return TRUE
@@ -436,4 +436,4 @@
name = "Insulated probosci"
id = "deep_control"
desc = "Your probosci become insulated, protecting them from neural shocks. This makes it harder for the host to regain control over their body."
- soul_price = 2
\ No newline at end of file
+ soul_price = 2
diff --git a/code/modules/antagonists/horror/horror_datums.dm b/code/modules/antagonists/horror/horror_datums.dm
index bc9959280ec8..0cf4ac92fdb2 100644
--- a/code/modules/antagonists/horror/horror_datums.dm
+++ b/code/modules/antagonists/horror/horror_datums.dm
@@ -101,7 +101,7 @@
to_chat(user, span_bold("[H.real_name] has awoken into your service!"))
used = TRUE
icon_state = "pet_carrier_open"
- sleep(5)
+ sleep(0.5 SECONDS)
var/obj/item/horrorsummonhorn/horn = new /obj/item/horrorsummonhorn(get_turf(src))
horn.summoner = user.mind
horn.horror = H
@@ -144,7 +144,7 @@
sleep(5 SECONDS)
if(prob(20)) //yeah you're summoning an eldritch horror allright
new /obj/effect/temp_visual/summon(summonplace)
- sleep(10)
+ sleep(1 SECONDS)
var/type = pick(typesof(/mob/living/simple_animal/hostile/abomination))
var/mob/R = new type(summonplace)
playsound(summonplace, "sound/effects/phasein.ogg", 30)
@@ -154,7 +154,7 @@
summonplace.visible_message(span_danger("But nothing responds to the call!"))
else
new /obj/effect/temp_visual/summon(summonplace)
- sleep(10)
+ sleep(1 SECONDS)
horror.leave_victim()
horror.forceMove(summonplace)
playsound(summonplace, "sound/effects/phasein.ogg", 30)
diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm
index a604c1d4f6d1..f4908e049eb2 100644
--- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm
+++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm
@@ -75,8 +75,8 @@
user.filters += filter(type="wave", x=X, y=Y, size=rand()*2.5+0.5, offset=rand())
for(i=1, i<=7, ++i)
f = user.filters[start+i]
- animate(f, offset=f:offset, time=0, loop=3, flags=ANIMATION_PARALLEL)
- animate(offset=f:offset-1, time=rand()*20+10)
+ animate(f, offset=f:offset, time=0 SECONDS, loop=3, flags=ANIMATION_PARALLEL)
+ animate(offset=f:offset-1, time=rand()*20+(1 SECONDS))
if (do_after(user, 5 SECONDS, target=user) && user.cell.use(activationCost))
playsound(src, 'sound/effects/bamf.ogg', 100, 1, -6)
to_chat(user, span_notice("You are now disguised as the Nanotrasen engineering borg \"[friendlyName]\"."))
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index 91decd906d54..2977151c11fb 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -205,64 +205,64 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
/datum/action/innate/ai/nuke_station/proc/set_us_up_the_bomb(mob/living/owner)
set waitfor = FALSE
to_chat(owner, "run -o -a 'selfdestruct'")
- sleep(5)
+ sleep(0.5 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, "Running executable 'selfdestruct'...")
- sleep(rand(10, 30))
+ sleep(rand(1 SECONDS, 3 SECONDS))
if(!owner || QDELETED(owner))
return
owner.playsound_local(owner, 'sound/misc/bloblarm.ogg', 50, 0)
to_chat(owner, span_userdanger("!!! UNAUTHORIZED SELF-DESTRUCT ACCESS !!!"))
to_chat(owner, span_boldannounce("This is a class-3 security violation. This incident will be reported to Central Command."))
for(var/i in 1 to 3)
- sleep(20)
+ sleep(2 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, span_boldannounce("Sending security report to Central Command.....[rand(0, 9) + (rand(20, 30) * i)]%"))
- sleep(3)
+ sleep(0.3 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, "auth 'akjv9c88asdf12nb' ******************")
owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0)
- sleep(30)
+ sleep(3 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, span_boldnotice("Credentials accepted. Welcome, akjv9c88asdf12nb."))
owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0)
- sleep(5)
+ sleep(0.5 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, span_boldnotice("Arm self-destruct device? (Y/N)"))
owner.playsound_local(owner, 'sound/misc/compiler-stage1.ogg', 50, 0)
- sleep(20)
+ sleep(2 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, "Y")
- sleep(15)
+ sleep(1.5 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, span_boldnotice("Confirm arming of self-destruct device? (Y/N)"))
owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0)
- sleep(10)
+ sleep(1 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, "Y")
- sleep(rand(15, 25))
+ sleep(rand(1.5 SECONDS, 2.5 SECONDS))
if(!owner || QDELETED(owner))
return
to_chat(owner, span_boldnotice("Please repeat password to confirm."))
owner.playsound_local(owner, 'sound/misc/compiler-stage2.ogg', 50, 0)
- sleep(14)
+ sleep(1.4 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, "******************")
- sleep(40)
+ sleep(4 SECONDS)
if(!owner || QDELETED(owner))
return
to_chat(owner, span_boldnotice("Credentials accepted. Transmitting arming signal..."))
owner.playsound_local(owner, 'sound/misc/server-ready.ogg', 50, 0)
- sleep(30)
+ sleep(3 SECONDS)
if(!owner || QDELETED(owner))
return
if(owner.stat == DEAD)
@@ -336,7 +336,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module))
/obj/machinery/doomsday_device/proc/detonate()
sound_to_playing_players('sound/machines/alarm.ogg')
- sleep(100)
+ sleep(10 SECONDS)
for(var/i in GLOB.mob_living_list)
var/mob/living/L = i
var/turf/T = get_turf(L)
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
index e46f408f064c..f5192e31a9f5 100644
--- a/code/modules/antagonists/traitor/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/syndicate_contract.dm
@@ -134,7 +134,7 @@
priority_announce("One of your crew was captured by a rival organisation - we've needed to pay their ransom to bring them back. \
As is policy we've taken a portion of the station's funds to offset the overall cost.", null, null, null, "Nanotrasen Asset Protection")
- sleep(30)
+ sleep(3 SECONDS)
// Pay contractor their portion of ransom
if (status == CONTRACT_STATUS_COMPLETE)
@@ -154,7 +154,7 @@
/datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M)
// Ship 'em back - dead or alive, 4 minutes wait.
// Even if they weren't the target, we're still treating them the same.
- addtimer(CALLBACK(src, .proc/returnVictim, M), (60 * 10) * 4)
+ addtimer(CALLBACK(src, .proc/returnVictim, M), (6 SECONDS * 10) * 4)
if (M.stat != DEAD)
// Heal them up - gets them out of crit/soft crit. If omnizine is removed in the future, this needs to be replaced with a
@@ -163,26 +163,26 @@
M.flash_act()
M.confused += 10
- M.blur_eyes(5)
+ M.blur_eyes(0.5 SECONDS)
to_chat(M, span_warning("You feel strange..."))
- sleep(60)
+ sleep(6 SECONDS)
to_chat(M, span_warning("That pod did something to you..."))
- M.Dizzy(35)
- sleep(65)
+ M.Dizzy(3.5 SECONDS)
+ sleep(6.5 SECONDS)
to_chat(M, span_warning("Your head pounds... It feels like it's going to burst out your skull!"))
M.flash_act()
M.confused += 20
M.blur_eyes(3)
- sleep(30)
+ sleep(3 SECONDS)
to_chat(M, span_warning("Your head pounds..."))
- sleep(100)
+ sleep(10 SECONDS)
M.flash_act()
- M.Unconscious(200)
+ M.Unconscious(20 SECONDS)
to_chat(M, "A million voices echo in your head... \"Your mind held many valuable secrets - \
we thank you for providing them. Your value is expended, and you will be ransomed back to your station. We always get paid, \
so it's only a matter of time before we ship you back...\"")
- M.blur_eyes(10)
- M.Dizzy(15)
+ M.blur_eyes(1 SECONDS)
+ M.Dizzy(1.5 SECONDS)
M.confused += 20
// We're returning the victim
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index a367440cf208..8bd1fa6b0ba9 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -430,12 +430,12 @@
playsound(T,'sound/magic/warpwhistle.ogg', 200, 1)
user.mobility_flags &= ~MOBILITY_MOVE
new /obj/effect/temp_visual/tornado(T)
- sleep(20)
+ sleep(2 SECONDS)
if(interrupted(user))
return
user.invisibility = INVISIBILITY_MAXIMUM
user.status_flags |= GODMODE
- sleep(20)
+ sleep(2 SECONDS)
if(interrupted(user))
end_effect(user)
return
@@ -449,12 +449,12 @@
break
breakout += 1
new /obj/effect/temp_visual/tornado(T)
- sleep(20)
+ sleep(2 SECONDS)
end_effect(user)
if(interrupted(user))
return
on_cooldown = 2
- sleep(40)
+ sleep(4 SECONDS)
on_cooldown = 0
/obj/item/warpwhistle/Destroy()
@@ -474,4 +474,4 @@
/obj/effect/temp_visual/tornado/Initialize()
. = ..()
- animate(src, pixel_x = -500, time = 40)
+ animate(src, pixel_x = -500, time = 4 SECONDS)
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index be8708ffcd23..6f89c8901b7c 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -68,7 +68,7 @@
/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.
audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*")
playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)
- sleep(10)
+ sleep(1 SECONDS)
if(QDELETED(src))
return
if(status)
diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm
index 6b5a3fd0111a..e578faa77e43 100644
--- a/code/modules/assembly/doorcontrol.dm
+++ b/code/modules/assembly/doorcontrol.dm
@@ -82,19 +82,19 @@
if (M.id == src.id)
INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/open)
- sleep(10)
+ sleep(1 SECONDS)
for(var/obj/machinery/mass_driver/M in GLOB.machines)
if(M.id == src.id)
M.drive()
- sleep(60)
+ sleep(6 SECONDS)
for(var/obj/machinery/door/poddoor/M in GLOB.machines)
if (M.id == src.id)
INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/close)
- addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10)
+ addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 1 SECONDS)
/obj/item/assembly/control/igniter
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 829b44950013..836c78b8a0a8 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -197,7 +197,7 @@
src.visible_message(span_warning("[src] is unable to treat [mob_occupant] as they cannot be treated with conventional medicine."))
playsound(src,'sound/machines/cryo_warning_ignore.ogg',60,1)
on = FALSE
- sleep(2)// here for timing. Shuts off right at climax of the effect before falloff.
+ sleep(0.2 SECONDS)// here for timing. Shuts off right at climax of the effect before falloff.
update_icon()
return
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
index 7bc6043fd76c..18f015b6ecbb 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
@@ -71,7 +71,7 @@
h_g = 64 + (h_g - 64) * scale
h_b = 64 + (h_b - 64) * scale
- animate(src, color = rgb(h_r, h_g, h_b), time = 20, easing = SINE_EASING)
+ animate(src, color = rgb(h_r, h_g, h_b), time = 2 SECONDS, easing = SINE_EASING)
//burn any mobs buckled based on temperature
if(has_buckled_mobs())
diff --git a/code/modules/awaymissions/mission_code/mining.dm b/code/modules/awaymissions/mission_code/mining.dm
index f4bb0013a2b9..2ee4d2d45a06 100644
--- a/code/modules/awaymissions/mission_code/mining.dm
+++ b/code/modules/awaymissions/mission_code/mining.dm
@@ -201,7 +201,7 @@
/obj/item/extinguisher=1)
/datum/component/spawner/megafauna
- var/spawn_wait_time = 150 // time to next spawn when the megafauna dies, 15 seconds
+ var/spawn_wait_time = 15 SECONDS // time to next spawn when the megafauna dies, 15 seconds
var/initial_spawned = FALSE // so we don't clear the arena and open the door on the initial spawn
var/nest_range = 10
diff --git a/code/modules/awaymissions/mission_code/runner.dm b/code/modules/awaymissions/mission_code/runner.dm
index 89531f8f50b5..26092eea377e 100644
--- a/code/modules/awaymissions/mission_code/runner.dm
+++ b/code/modules/awaymissions/mission_code/runner.dm
@@ -21,7 +21,7 @@ GLOBAL_LIST_EMPTY(vr_runner_tiles)
light_range = 4
var/game_starting = FALSE
var/game_start_time = FALSE
- var/fall_wait = 5 // time in deciseconds between randomly falling tiles
+ var/fall_wait = 0.5 SECONDS // time in seconds between randomly falling tiles
/obj/effect/portal/permanent/one_way/recall/pit_faller/teleport(atom/movable/M, force = FALSE)
if(GLOB.vr_runner_active)
@@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(vr_runner_tiles)
return FALSE
for(var/mob/living/carbon/human/H in GLOB.vr_runner_players)
to_chat(H, span_notice("Game starting in [seconds_remaining]."))
- sleep(10)
+ sleep(1 SECONDS)
if(GLOB.vr_runner_players.len)
GLOB.vr_runner_active = TRUE
for(var/mob/living/carbon/human/H in GLOB.vr_runner_players)
@@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(vr_runner_tiles)
name = "Shaky Ground"
desc = "If you walk on that that you better keep running!"
var/not_reset = FALSE // check so turfs dont fall after being reset
- var/falling_time = 15 // time it takes for the turf to fall
+ var/falling_time = 1.5 SECONDS // time it takes for the turf to fall
/turf/open/indestructible/runner/Initialize()
. = ..()
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index aff5e05622a6..176102e7ee3a 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -113,7 +113,7 @@
for(var/i in 1 to statements.len)
say(span_deadsay("[statements[i]]"))
if(i != statements.len)
- sleep(30)
+ sleep(3 SECONDS)
/obj/item/rupee
name = "weird crystal"
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 7c20ebb679bf..95c637897547 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -38,8 +38,8 @@
var/style = STYLE_STANDARD //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
var/reversing = FALSE //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off it's newly-acquired cargo to
- var/fallDuration = 4
- var/fallingSoundLength = 11
+ var/fallDuration = 0.4 SECONDS
+ var/fallingSoundLength = 1.1 SECONDS
var/fallingSound = 'sound/weapons/mortar_long_whistle.ogg'//Admin sound to play before the pod lands
var/landingSound //Admin sound to play when the pod lands
var/openingSound //Admin sound to play when the pod opens
@@ -250,14 +250,14 @@
organ_to_yeet.Remove(carbon_target_mob) //Note that this isn't the same proc as for lists
organ_to_yeet.forceMove(turf_underneath) //Move the organ outta the body
organ_to_yeet.throw_at(destination, 2, 3) //Thow the organ at a random tile 3 spots away
- sleep(1)
+ sleep(0.1 SECONDS)
for (var/bp in carbon_target_mob.bodyparts) //Look at the bodyparts in our poor mob beneath our pod as it lands
var/obj/item/bodypart/bodypart = bp
var/destination = get_edge_target_turf(turf_underneath, pick(GLOB.alldirs))
if (bodypart.dismemberable)
bodypart.dismember() //Using the power of flextape i've sawed this man's bodypart in half!
bodypart.throw_at(destination, 2, 3)
- sleep(1)
+ sleep(0.1 SECONDS)
if (effectGib) //effectGib is on, that means whatever's underneath us better be fucking oof'd on
target_living.adjustBruteLoss(5000) //THATS A LOT OF DAMAGE (called just in case gib() doesnt work on em)
@@ -410,8 +410,8 @@
/obj/structure/closet/supplypod/proc/preReturn(atom/movable/holder)
deleteRubble()
- animate(holder, alpha = 0, time = 8, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
- animate(holder, pixel_z = 400, time = 10, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) //Animate our rising pod
+ animate(holder, alpha = 0, time = 0.8 SECONDS, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL)
+ animate(holder, pixel_z = 400, time = 1 SECONDS, easing = QUAD_EASING|EASE_IN, flags = ANIMATION_PARALLEL) //Animate our rising pod
addtimer(CALLBACK(src, .proc/handleReturnAfterDeparting, holder), 15) //Finish up the pod's duties after a certain amount of time
/obj/structure/closet/supplypod/setOpened() //Proc exists here, as well as in any atom that can assume the role of a "holder" of a supplypod. Check the open_pod() proc for more details
@@ -490,9 +490,9 @@
alpha = 255
/obj/effect/engineglow/proc/fadeAway(leaveTime)
- var/duration = min(leaveTime, 25)
+ var/duration = min(leaveTime, 2.5 SECONDS)
animate(src, alpha=0, time = duration)
- QDEL_IN(src, duration + 5)
+ QDEL_IN(src, duration + 0.5 SECONDS)
/obj/effect/supplypod_smoke/proc/drawSelf(amount)
alpha = max(0, 255-(amount*20))
@@ -515,7 +515,7 @@
return rubble_overlay
/obj/effect/supplypod_rubble/proc/fadeAway()
- animate(src, alpha=0, time = 30)
+ animate(src, alpha=0, time = 3 SECONDS)
QDEL_IN(src, 35)
/obj/effect/supplypod_rubble/proc/setStyle(type, obj/structure/closet/supplypod/pod)
@@ -580,9 +580,9 @@
mob_in_pod.reset_perspective(src)
if(pod.effectStun) //If effectStun is true, stun any mobs caught on this DPtarget until the pod gets a chance to hit them
for (var/mob/living/target_living in get_turf(src))
- target_living.Stun(pod.landingDelay+10, ignore_canstun = TRUE)//you ain't goin nowhere, kid.
+ target_living.Stun(pod.landingDelay+1 SECONDS, ignore_canstun = TRUE)//you ain't goin nowhere, kid.
if (pod.fallDuration == initial(pod.fallDuration) && pod.landingDelay + pod.fallDuration < pod.fallingSoundLength)
- pod.fallingSoundLength = 3 //The default falling sound is a little long, so if the landing time is shorter than the default falling sound, use a special, shorter default falling sound
+ pod.fallingSoundLength = 0.3 SECONDS //The default falling sound is a little long, so if the landing time is shorter than the default falling sound, use a special, shorter default falling sound
pod.fallingSound = 'sound/weapons/mortar_whistle.ogg'
var/soundStartTime = pod.landingDelay - pod.fallingSoundLength + pod.fallDuration
if (soundStartTime < 0)
@@ -629,14 +629,14 @@
smoke_part.filters += filter(type = "blur", size = 4)
var/time = (pod.fallDuration / length(smoke_effects))*(length(smoke_effects)-i)
addtimer(CALLBACK(smoke_part, /obj/effect/supplypod_smoke/.proc/drawSelf, i), time, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
- QDEL_IN(smoke_part, pod.fallDuration + 35)
+ QDEL_IN(smoke_part, pod.fallDuration + 3.5 SECONDS)
/obj/effect/DPtarget/proc/drawSmoke()
if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH)
return
for (var/obj/effect/supplypod_smoke/smoke_part in smoke_effects)
- animate(smoke_part, alpha = 0, time = 20, flags = ANIMATION_PARALLEL)
- animate(smoke_part.filters[1], size = 6, time = 15, easing = CUBIC_EASING|EASE_OUT, flags = ANIMATION_PARALLEL)
+ animate(smoke_part, alpha = 0, time = 2 SECONDS, flags = ANIMATION_PARALLEL)
+ animate(smoke_part.filters[1], size = 6, time = 1.5 SECONDS, easing = CUBIC_EASING|EASE_OUT, flags = ANIMATION_PARALLEL)
/obj/effect/DPtarget/proc/endLaunch()
pod.tryMakeRubble(drop_location())
diff --git a/code/modules/chatter/chatter.dm b/code/modules/chatter/chatter.dm
index 2dfd0bd77d54..3cca56dc6dd8 100644
--- a/code/modules/chatter/chatter.dm
+++ b/code/modules/chatter/chatter.dm
@@ -22,16 +22,16 @@
// simulate pausing in talking
// ignore semi-colons because of their use in HTML escaping
if (item in list(",", ":"))
- sleep(3)
+ sleep(0.3 SECONDS)
if (item in list("!", "?", "."))
- sleep(6)
+ sleep(0.6 SECONDS)
continue
if(isnum(item))
var/length = min(item, 10)
if (length == 0)
// "verbalise" long spaces
- sleep(1)
+ sleep(0.1 SECONDS)
chatter_speak_word(A.loc, phomeme, length)
/proc/chatter_speak_word(loc, phomeme, length)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index e4357b92f99f..e1c07cb8ce1f 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -147,7 +147,7 @@
if(active_sound)
while(up)
playsound(src, "[active_sound]", 100, FALSE, 4)
- sleep(15)
+ sleep(1.5 SECONDS)
/obj/item/clothing/head/helmet/justice
name = "helmet of justice"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 16e105eaebc6..e6cdf9b9dfac 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -18,7 +18,7 @@
/obj/item/clothing/head/chefhat/suicide_act(mob/user)
user.visible_message(span_suicide("[user] is donning [src]! It looks like [user.p_theyre()] trying to become a chef."))
user.say("Bork Bork Bork!", forced = "chef hat suicide")
- sleep(20)
+ sleep(2 SECONDS)
user.visible_message(span_suicide("[user] climbs into an imaginary oven!"))
user.say("BOOORK!", forced = "chef hat suicide")
playsound(user, 'sound/machines/ding.ogg', 50, 1)
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 79ba7ab5eddc..888f05ae54c9 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -226,7 +226,7 @@
var/mob/living/carbon/human/H = user
user.visible_message(span_suicide("[user] is donning [src]! It looks like [user.p_theyre()] trying to be nice to girls."))
user.say("M'lady.", forced = "fedora suicide")
- sleep(10)
+ sleep(1 SECONDS)
H.facial_hair_style = "Neckbeard"
return(BRUTELOSS)
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 5379520d045b..0a583f0f2803 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -34,7 +34,7 @@
else//didnt realize this suicide act existed (was in miscellaneous.dm) and didnt want to remove it, so made it a 50/50 chance. Why not!
user.visible_message(span_suicide("[user] is bashing [user.p_their()] own head in with [src]! Ain't that a kick in the head?"))
for(var/i = 0, i < 3, i++)
- sleep(3)
+ sleep(0.3 SECONDS)
playsound(user, 'sound/weapons/genhit2.ogg', 50, 1)
return(BRUTELOSS)
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index b222c1bf100a..fe36460603c8 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -140,13 +140,13 @@
user.anchored = TRUE
user.Stun(INFINITY)
- animate(user, color = "#00ccee", time = 3)
+ animate(user, color = "#00ccee", time = 0.3 SECONDS)
phase_timer_id = addtimer(CALLBACK(src, .proc/phase_2, user, to_turf, phase_in_ds), 3, TIMER_STOPPABLE)
/obj/item/clothing/suit/space/chronos/proc/phase_2(mob/living/carbon/human/user, turf/to_turf, phase_in_ds)
if(teleporting && activated && user)
- animate(user, color = list(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 1,1,1,0), time = 2)
- phase_timer_id = addtimer(CALLBACK(src, .proc/phase_3, user, to_turf, phase_in_ds), 2, TIMER_STOPPABLE)
+ animate(user, color = list(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 1,1,1,0), time = 0.2 SECONDS)
+ phase_timer_id = addtimer(CALLBACK(src, .proc/phase_3, user, to_turf, phase_in_ds), 0.2 SECONDS, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
@@ -160,7 +160,7 @@
/obj/item/clothing/suit/space/chronos/proc/phase_4(mob/living/carbon/human/user, turf/to_turf)
if(teleporting && activated && user)
- animate(user, color = "#ffffff", time = 3)
+ animate(user, color = "#ffffff", time = 0.3 SECONDS)
phase_timer_id = addtimer(CALLBACK(src, .proc/finish_chronowalk, user, to_turf), 3, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index adcda70ffb42..5c40f4135e90 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -174,7 +174,7 @@
var/list/factions = usr.faction
M.faction = factions
src.robe_charge = FALSE
- sleep(30)
+ sleep(3 SECONDS)
src.robe_charge = TRUE
to_chat(usr, span_notice("\The robe hums, its internal magic supply restored."))
diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm
index d364176b78a7..97e6e7375e9a 100644
--- a/code/modules/events/aurora_caelus.dm
+++ b/code/modules/events/aurora_caelus.dm
@@ -59,5 +59,5 @@
var/new_light = initial(S.light_range)
while(S.light_range > new_light)
S.set_light(S.light_range - 0.2)
- sleep(30)
+ sleep(3 SECONDS)
S.set_light(new_light, initial(S.light_power), initial(S.light_color))
diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm
index 5ef30d003074..cb753dc31b7c 100644
--- a/code/modules/events/portal_storm.dm
+++ b/code/modules/events/portal_storm.dm
@@ -58,9 +58,9 @@
/datum/round_event/portal_storm/announce(fake)
set waitfor = 0
sound_to_playing_players('sound/magic/lightning_chargeup.ogg')
- sleep(80)
+ sleep(8 SECONDS)
priority_announce("Massive bluespace anomaly detected en route to [station_name()]. Brace for impact.")
- sleep(20)
+ sleep(2 SECONDS)
sound_to_playing_players('sound/magic/lightningbolt.ogg')
/datum/round_event/portal_storm/tick()
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 5827868443c1..d11482e09675 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -522,7 +522,7 @@
if(!istype(D, /obj/machinery/door/airlock/external))
var/obj/machinery/door/airlock/A = D
playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, 1)
- sleep(60)
+ sleep(6 SECONDS)
A.open(2)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_spread(src, stepturf)
diff --git a/code/modules/events/wizard/fakeexplosion.dm b/code/modules/events/wizard/fakeexplosion.dm
index 8f99af1fc6b4..eff0b4109535 100644
--- a/code/modules/events/wizard/fakeexplosion.dm
+++ b/code/modules/events/wizard/fakeexplosion.dm
@@ -7,5 +7,5 @@
/datum/round_event/wizard/fake_explosion/start()
sound_to_playing_players('sound/machines/alarm.ogg')
- sleep(100)
- Cinematic(CINEMATIC_NUKE_FAKE,world)
\ No newline at end of file
+ sleep(10 SECONDS)
+ Cinematic(CINEMATIC_NUKE_FAKE,world)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 252f398dfc43..95f7c61c230e 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -243,16 +243,16 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(pump)
feedback_details += "Vent Coords: [pump.x],[pump.y],[pump.z]"
xeno = new(pump.loc,target)
- sleep(10)
+ sleep(1 SECONDS)
xeno.update_icon("alienh_leap",'icons/mob/alienleap.dmi',-32,-32)
xeno.throw_at(target,7,1, xeno, FALSE, TRUE)
- sleep(10)
+ sleep(1 SECONDS)
xeno.update_icon("alienh_leap",'icons/mob/alienleap.dmi',-32,-32)
xeno.throw_at(pump,7,1, xeno, FALSE, TRUE)
- sleep(10)
+ sleep(1 SECONDS)
var/xeno_name = xeno.name
to_chat(target, span_notice("[xeno_name] begins climbing into the ventilation system..."))
- sleep(30)
+ sleep(3 SECONDS)
qdel(xeno)
to_chat(target, span_notice("[xeno_name] scrambles into the ventilation ducts!"))
qdel(src)
@@ -312,13 +312,13 @@ GLOBAL_LIST_INIT(hallucination_list, list(
shake_camera(target, 2, 1)
if(bubblegum.Adjacent(target) && !charged)
charged = TRUE
- target.Paralyze(80)
+ target.Paralyze(8 SECONDS)
target.adjustStaminaLoss(40)
step_away(target, bubblegum)
shake_camera(target, 4, 3)
target.visible_message(span_warning("[target] jumps backwards, falling on the ground!"),span_userdanger("[bubblegum] slams into you!"))
- sleep(2)
- sleep(30)
+ sleep(0.2 SECONDS)
+ sleep(3 SECONDS)
qdel(src)
/datum/hallucination/oh_yeah/Destroy()
@@ -390,19 +390,19 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if("stunprod") //Stunprod + cablecuff
target.playsound_local(source, 'sound/weapons/egloves.ogg', 40, 1)
target.playsound_local(source, get_sfx("bodyfall"), 25, 1)
- sleep(20)
+ sleep(2 SECONDS)
target.playsound_local(source, 'sound/weapons/cablecuff.ogg', 15, 1)
if("harmbaton") //zap n slap
target.playsound_local(source, 'sound/weapons/egloves.ogg', 40, 1)
target.playsound_local(source, get_sfx("bodyfall"), 25, 1)
- sleep(20)
+ sleep(2 SECONDS)
for(var/i in 1 to rand(5, 12))
target.playsound_local(source, "swing_hit", 50, 1)
sleep(rand(CLICK_CD_MELEE, CLICK_CD_MELEE + 4))
if("bomb") // Tick Tock
for(var/i in 1 to rand(3, 11))
target.playsound_local(source, 'sound/items/timer.ogg', 25, 0)
- sleep(15)
+ sleep(1.5 SECONDS)
qdel(src)
/datum/hallucination/items_other
@@ -500,7 +500,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
A = image(image_file,H,"arm_blade", layer=ABOVE_MOB_LAYER)
if(target.client)
target.client.images |= A
- sleep(rand(150,250))
+ sleep(rand(15,25) SECONDS)
if(item == "esword" || item == "dual_esword")
target.playsound_local(H, 'sound/weapons/saberoff.ogg',35,1)
if(item == "armblade")
@@ -625,12 +625,12 @@ GLOBAL_LIST_INIT(hallucination_list, list(
lock.airlock = A
locks += lock
lock.lock()
- sleep(rand(4,12))
- sleep(100)
+ sleep(rand(0.4,1.2) SECONDS)
+ sleep(10 SECONDS)
for(var/obj/effect/hallucination/fake_door_lock/lock in locks)
locks -= lock
lock.unlock()
- sleep(rand(4,12))
+ sleep(rand(0.4,1.2) SECONDS)
qdel(src)
/obj/effect/hallucination/fake_door_lock
@@ -785,7 +785,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.playsound_local(source,'sound/machines/airlock.ogg', 30, 1)
if("airlock pry")
target.playsound_local(source,'sound/machines/airlock_alien_prying.ogg', 100, 1)
- sleep(50)
+ sleep(5 SECONDS)
target.playsound_local(source, 'sound/machines/airlockforced.ogg', 30, 1)
if("console")
target.playsound_local(source,'sound/machines/terminal_prompt.ogg', 25, 1)
@@ -811,18 +811,18 @@ GLOBAL_LIST_INIT(hallucination_list, list(
else
target.playsound_local(source, 'sound/mecha/mechturn.ogg', 40, 1)
mech_dir = pick(GLOB.cardinals)
- sleep(10)
+ sleep(1 SECONDS)
//Deconstructing a wall
if("wall decon")
target.playsound_local(source, 'sound/items/welder.ogg', 50, 1)
- sleep(105)
+ sleep(10.5 SECONDS)
target.playsound_local(source, 'sound/items/welder2.ogg', 50, 1)
- sleep(15)
+ sleep(1.5 SECONDS)
target.playsound_local(source, 'sound/items/ratchet.ogg', 50, 1)
//Hacking a door
if("door hack")
target.playsound_local(source, 'sound/items/screwdriver.ogg', 50, 1)
- sleep(rand(40,80))
+ sleep(rand(4,8) SECONDS)
target.playsound_local(source, 'sound/machines/airlockforced.ogg', 30, 1)
qdel(src)
@@ -839,11 +839,11 @@ GLOBAL_LIST_INIT(hallucination_list, list(
switch(sound_type)
if("phone")
target.playsound_local(source, 'sound/weapons/ring.ogg', 15)
- sleep(25)
+ sleep(2.5 SECONDS)
target.playsound_local(source, 'sound/weapons/ring.ogg', 15)
- sleep(25)
+ sleep(2.5 SECONDS)
target.playsound_local(source, 'sound/weapons/ring.ogg', 15)
- sleep(25)
+ sleep(2.5 SECONDS)
target.playsound_local(source, 'sound/weapons/ring.ogg', 15)
if("hyperspace")
target.playsound_local(null, 'sound/effects/hyperspace_begin.ogg', 50)
@@ -863,9 +863,9 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.playsound_local(source, pick(CREEPY_SOUNDS), 50, 1)
if("tesla") //Tesla loose!
target.playsound_local(source, 'sound/magic/lightningbolt.ogg', 35, 1)
- sleep(30)
+ sleep(3 SECONDS)
target.playsound_local(source, 'sound/magic/lightningbolt.ogg', 65, 1)
- sleep(30)
+ sleep(3 SECONDS)
target.playsound_local(source, 'sound/magic/lightningbolt.ogg', 100, 1)
qdel(src)
@@ -886,7 +886,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if("ratvar")
target.playsound_local(target, 'sound/machines/clockcult/ark_deathrattle.ogg', 50, FALSE, pressure_affected = FALSE)
target.playsound_local(target, 'sound/effects/clockcult_gateway_disrupted.ogg', 50, FALSE, pressure_affected = FALSE)
- sleep(27)
+ sleep(2.7 SECONDS)
target.playsound_local(target, 'sound/effects/explosion_distant.ogg', 50, FALSE, pressure_affected = FALSE)
if("shuttle dock")
to_chat(target, "Priority Announcement
")
@@ -915,13 +915,13 @@ GLOBAL_LIST_INIT(hallucination_list, list(
chosen_screwyhud = pick(SCREWYHUD_CRIT,SCREWYHUD_DEAD,SCREWYHUD_HEALTHY)
target.set_screwyhud(chosen_screwyhud)
feedback_details += "Type: [target.hal_screwyhud]"
- sleep(rand(100,250))
+ sleep(rand(10,25) SECONDS)
target.set_screwyhud(SCREWYHUD_NONE)
qdel(src)
/datum/hallucination/fake_alert
-/datum/hallucination/fake_alert/New(mob/living/carbon/C, forced = TRUE, specific, duration = 150)
+/datum/hallucination/fake_alert/New(mob/living/carbon/C, forced = TRUE, specific, duration = 15 SECONDS)
set waitfor = FALSE
..()
var/alert_type = pick("not_enough_oxy","not_enough_tox","not_enough_co2","too_much_oxy","too_much_co2","too_much_tox","newlaw","nutrition","charge","gravity","fire","locked","hacked","temphot","tempcold","pressure")
@@ -1155,10 +1155,10 @@ GLOBAL_LIST_INIT(hallucination_list, list(
else
fakemob = target //ever been so lonely you had to haunt yourself?
if(fakemob)
- sleep(rand(20, 50))
+ sleep(rand(2, 5) SECONDS)
to_chat(target, "DEAD: [fakemob.name] says, \"[pick("rip","why did i just drop dead?","hey [target.first_name()]","git gud","you too?","is the AI rogue?",\
"i[prob(50)?" fucking":""] hate [pick("blood cult", "clock cult", "revenants", "this round","this","myself","admins","you")]")]\"")
- sleep(rand(70,90))
+ sleep(rand(7,9) SECONDS)
target.set_screwyhud(SCREWYHUD_NONE)
target.SetParalyzed(0)
target.silent = FALSE
@@ -1178,20 +1178,20 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.client.images += fire_overlay
to_chat(target, span_userdanger("You're set on fire!"))
target.throw_alert("fire", /obj/screen/alert/fire, override = TRUE)
- sleep(20)
+ sleep(2 SECONDS)
for(var/i in 1 to 3)
if(target.fire_stacks <= 0)
clear_fire()
return
stage++
update_temp()
- sleep(30)
+ sleep(3 SECONDS)
for(var/i in 1 to rand(5, 10))
if(target.fire_stacks <= 0)
clear_fire()
return
target.adjustStaminaLoss(15)
- sleep(20)
+ sleep(2 SECONDS)
clear_fire()
/datum/hallucination/fire/proc/update_temp()
@@ -1212,7 +1212,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
while(stage > 0)
stage--
update_temp()
- sleep(30)
+ sleep(3 SECONDS)
qdel(src)
/datum/hallucination/shock
@@ -1274,7 +1274,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(target.client)
target.client.images += target.halbody
- sleep(rand(30,50)) //Only seen for a brief moment.
+ sleep(rand(3,5) SECONDS) //Only seen for a brief moment.
if(target.client)
target.client.images -= target.halbody
QDEL_NULL(target.halbody)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index f2cedec97721..0fea05dee27f 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -426,19 +426,19 @@
return SHAME
if(!is_drainable())
open_soda()
- sleep(10)
+ sleep(1 SECONDS)
H.visible_message(span_suicide("[H] takes a big sip from [src]! It looks like [H.p_theyre()] trying to commit suicide!"))
playsound(H,'sound/items/drink.ogg', 80, 1)
reagents.trans_to(H, src.reagents.total_volume, transfered_by = H) //a big sip
- sleep(5)
+ sleep(0.5 SECONDS)
H.say(pick("Now, Outbomb Cuban Pete, THAT was a game.", "All these new fangled arcade games are too slow. I prefer the classics.", "They don't make 'em like Orion Trail anymore.", "You know what they say. Worst day of spess carp fishing is better than the best day at work.", "They don't make 'em like good old fashioned singularity engines anymore."))
if(H.age >= 30)
- H.Stun(50)
- sleep(50)
+ H.Stun(5 SECONDS)
+ sleep(5 SECONDS)
playsound(H,'sound/items/drink.ogg', 80, 1)
H.say(pick("Another day, another dollar.", "I wonder if I should hold?", "Diversifying is for young'ns.", "Yeap, times were good back then."))
return MANUAL_SUICIDE_NONLETHAL
- sleep(20) //dramatic pause
+ sleep(2 SECONDS) //dramatic pause
return TOXLOSS
/obj/item/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
@@ -618,4 +618,4 @@
pixel_x = rand(-4,4)
pixel_y = rand(-4,4)
if (random_sprite)
- icon_state = "colocup[rand(0, 6)]"
\ No newline at end of file
+ icon_state = "colocup[rand(0, 6)]"
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 5dfd4c797014..54188dca3a12 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -148,7 +148,7 @@
update_icon()
var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
+ animate(src, pixel_x = pixel_x + offset, time = 0.02 SECONDS, loop = 200) //start shaking
var/mob/living/mob_occupant = occupant
var/sourcename = mob_occupant.real_name
var/sourcejob
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index 0989a86dff5d..a111d46b6741 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -77,7 +77,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
to_chat(user, span_notice("You stuff the monkey into the machine."))
playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
+ animate(src, pixel_x = pixel_x + offset, time = 0.02 SECONDS, loop = 200) //start shaking
use_power(500)
stored_matter += cube_production
addtimer(VARSET_CALLBACK(src, pixel_x, initial(pixel_x)))
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index c04321ac1a8a..d6905ffa1333 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -107,7 +107,7 @@
span_italics("You hear a food processor."))
playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
use_power(500)
- var/total_time = 0
+ var/total_time = 0 SECONDS
for(var/O in src.contents)
var/datum/food_processor_process/P = select_recipe(O)
if (!P)
@@ -115,7 +115,7 @@
continue
total_time += P.time
var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = (total_time / rating_speed)*5) //start shaking
+ animate(src, pixel_x = pixel_x + offset, time = 0.02 SECONDS, loop = (total_time / rating_speed)*5) //start shaking
sleep(total_time / rating_speed)
for(var/atom/movable/O in src.contents)
var/datum/food_processor_process/P = select_recipe(O)
diff --git a/code/modules/goals/station_goals/shield.dm b/code/modules/goals/station_goals/shield.dm
index 05987714fd38..fa8c89811907 100644
--- a/code/modules/goals/station_goals/shield.dm
+++ b/code/modules/goals/station_goals/shield.dm
@@ -111,10 +111,10 @@
to_chat(user, span_notice("You [active ? "deactivate": "activate"] [src]."))
active = !active
if(active)
- animate(src, pixel_y = 2, time = 10, loop = -1)
+ animate(src, pixel_y = 2, time = 1 SECONDS, loop = -1)
anchored = TRUE
else
- animate(src, pixel_y = 0, time = 10)
+ animate(src, pixel_y = 0, time = 1 SECONDS)
anchored = FALSE
update_icon()
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 30753cb31f17..532862fd2f1a 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -37,11 +37,11 @@
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message(span_suicide("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!"))
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
- sleep(25)
+ sleep(2.5 SECONDS)
if(!user)
return (OXYLOSS)
user.say("BANG!", forced = /datum/reagent/consumable/banana)
- sleep(25)
+ sleep(2.5 SECONDS)
if(!user)
return (OXYLOSS)
user.visible_message("[user] laughs so hard they begin to suffocate!")
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 6391dbc6e279..484f006a86a3 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -393,7 +393,7 @@
harvest = 0
weedlevel = 0 // Reset
- sleep(5) // Wait a while
+ sleep(0.5 SECONDS) // Wait a while
update_icon()
visible_message(span_warning("[oldPlantName] suddenly mutates into [myseed.plantname]!"))
update_name()
@@ -413,7 +413,7 @@
harvest = 0
weedlevel = 0 // Reset
- sleep(5) // Wait a while
+ sleep(0.5 SECONDS) // Wait a while
update_icon()
visible_message(span_warning("The mutated weeds in [src] spawn some [myseed.plantname]!"))
update_name()
diff --git a/code/modules/library/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm
index 1d28f096436a..031a23f7a359 100644
--- a/code/modules/library/lib_codex_gigas.dm
+++ b/code/modules/library/lib_codex_gigas.dm
@@ -54,7 +54,7 @@
usedName += "x"
var/datum/antagonist/devil/devil = devilInfo(usedName)
display_devil(devil, user, usedName)
- sleep(10)
+ sleep(1 SECONDS)
onclose(user, "book")
inUse = FALSE
diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm
index ae1f92a328d3..1af12253873b 100644
--- a/code/modules/mining/equipment/mineral_scanner.dm
+++ b/code/modules/mining/equipment/mineral_scanner.dm
@@ -84,7 +84,7 @@
layer = FLASH_LAYER
icon = 'icons/effects/ore_visuals.dmi'
appearance_flags = 0 //to avoid having TILE_BOUND in the flags, so that the 480x480 icon states let you see it no matter where you are
- duration = 35
+ duration = 3.5 SECONDS
pixel_x = -224
pixel_y = -224
diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm
index c7fdd5b8d31b..603524253f60 100644
--- a/code/modules/mining/equipment/resonator.dm
+++ b/code/modules/mining/equipment/resonator.dm
@@ -54,7 +54,7 @@
desc = "A resonating field that significantly damages anything inside of it when the field eventually ruptures. More damaging in low pressure environments."
icon_state = "shield1"
layer = ABOVE_ALL_MOB_LAYER
- duration = 50
+ duration = 5 SECONDS
var/resonance_damage = 20
var/damage_multiplier = 1
var/creator
@@ -110,12 +110,12 @@
/obj/effect/temp_visual/resonance_crush
icon_state = "shield1"
layer = ABOVE_ALL_MOB_LAYER
- duration = 4
+ duration = 0.4 SECONDS
/obj/effect/temp_visual/resonance_crush/Initialize()
. = ..()
transform = matrix()*1.5
- animate(src, transform = matrix()*0.1, alpha = 50, time = 4)
+ animate(src, transform = matrix()*0.1, alpha = 50, time = 0.4 SECONDS)
/obj/effect/temp_visual/resonance/proc/replicate(turf/closed/mineral/M) //yogs start: adds replication to resonator fields
if(!istype(M) || !M.mineralType) // so we don't end up in the ultimate chain reaction
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 3597841a319a..115d9b1864ea 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -42,7 +42,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_global(src)
var/status = template.check_deploy(deploy_location)
switch(status)
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index d232a72c8eb2..38dc4ae81393 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -92,52 +92,52 @@ 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
holder_obj.cut_overlay(balloon2)
holder_obj.add_overlay(balloon)
playsound(holder_obj.loc, 'sound/items/fultext_deploy.ogg', 50, 1, -3)
- animate(holder_obj, pixel_z = 10, time = 20)
- sleep(20)
- animate(holder_obj, pixel_z = 15, time = 10)
- sleep(10)
- animate(holder_obj, pixel_z = 10, time = 10)
- sleep(10)
- animate(holder_obj, pixel_z = 15, time = 10)
- sleep(10)
- animate(holder_obj, pixel_z = 10, time = 10)
- sleep(10)
+ animate(holder_obj, pixel_z = 10, time = 2 SECONDS)
+ sleep(2 SECONDS)
+ animate(holder_obj, pixel_z = 15, time = 1 SECONDS)
+ sleep(1 SECONDS)
+ animate(holder_obj, pixel_z = 10, time = 1 SECONDS)
+ sleep(1 SECONDS)
+ animate(holder_obj, pixel_z = 15, time = 1 SECONDS)
+ sleep(1 SECONDS)
+ animate(holder_obj, pixel_z = 10, time = 1 SECONDS)
+ sleep(1 SECONDS)
playsound(holder_obj.loc, 'sound/items/fultext_launch.ogg', 50, 1, -3)
- animate(holder_obj, pixel_z = 1000, time = 30)
+ animate(holder_obj, pixel_z = 1000, time = 3 SECONDS)
if(ishuman(A))
var/mob/living/carbon/human/L = A
L.SetUnconscious(0)
L.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)
- animate(holder_obj, pixel_z = 15, time = 10)
- sleep(10)
- animate(holder_obj, pixel_z = 10, time = 10)
- sleep(10)
+ animate(holder_obj, pixel_z = 10, time = 5 SECONDS)
+ sleep(5 SECONDS)
+ animate(holder_obj, pixel_z = 15, time = 1 SECONDS)
+ sleep(1 SECONDS)
+ animate(holder_obj, pixel_z = 10, time = 1 SECONDS)
+ 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.anchored = FALSE // An item has to be unanchored to be extracted in the first place.
A.density = initial(A.density)
- animate(holder_obj, pixel_z = 0, time = 5)
- sleep(5)
+ animate(holder_obj, pixel_z = 0, time = 0.5 SECONDS)
+ sleep(0.5 SECONDS)
A.forceMove(holder_obj.loc)
qdel(holder_obj)
if(uses_left <= 0)
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 9a719c82e0f4..a900906fb6c7 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -349,7 +349,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
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
@@ -358,7 +358,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
qdel(link_holder)
return
link_holder.forceMove(get_turf(linked))
- sleep(2.5)
+ sleep(0.25 SECONDS)
if(QDELETED(user))
qdel(link_holder)
return
@@ -960,9 +960,9 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
var/transform_string = "lava"
var/reset_turf_type = /turf/open/floor/plating/asteroid/basalt
var/reset_string = "basalt"
- var/create_cooldown = 100
- var/create_delay = 30
- var/reset_cooldown = 50
+ var/create_cooldown = 10 SECONDS
+ var/create_delay = 3 SECONDS
+ var/reset_cooldown = 5 SECONDS
var/timer = 0
var/static/list/banned_turfs = typecacheof(list(/turf/open/space/transit, /turf/closed))
@@ -1321,7 +1321,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
if(isturf(user.loc))
user.visible_message("[span_hierophant_warning("[user] starts fiddling with [src]'s pommel...")]", \
span_notice("You start detaching the hierophant beacon..."))
- timer = world.time + 51
+ timer = world.time + 5.1 SECONDS
INVOKE_ASYNC(src, .proc/prepare_icon_update)
if(do_after(user, 5 SECONDS, target = user) && !beacon)
var/turf/T = get_turf(user)
@@ -1350,7 +1350,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
teleporting = TRUE //start channel
user.update_action_buttons_icon()
user.visible_message("[span_hierophant_warning("[user] starts to glow faintly...")]")
- timer = world.time + 50
+ timer = world.time + 5 SECONDS
INVOKE_ASYNC(src, .proc/prepare_icon_update)
beacon.icon_state = "hierophant_tele_on"
var/obj/effect/temp_visual/hierophant/telegraph/edge/TE1 = new /obj/effect/temp_visual/hierophant/telegraph/edge(user.loc)
@@ -1398,7 +1398,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
B.damage = 30
for(var/mob/living/L in range(1, source))
INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along
- 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
@@ -1416,20 +1416,20 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
var/turf/turf_to_teleport_to = get_step(target, get_dir(source, M)) //get position relative to caster
if(!turf_to_teleport_to || is_blocked_turf(turf_to_teleport_to, TRUE))
return
- animate(M, alpha = 0, time = 2, easing = EASE_OUT) //fade out
- sleep(1)
+ animate(M, alpha = 0, time = 0.2 SECONDS, easing = EASE_OUT) //fade out
+ sleep(0.1 SECONDS)
if(!M)
return
M.visible_message("[span_hierophant_warning("[M] fades out!")]")
- sleep(2)
+ sleep(0.2 SECONDS)
if(!M)
return
M.forceMove(turf_to_teleport_to)
- sleep(1)
+ sleep(0.1 SECONDS)
if(!M)
return
- animate(M, alpha = 255, time = 2, easing = EASE_IN) //fade IN
- sleep(1)
+ animate(M, alpha = 255, time = 0.2 SECONDS, easing = EASE_IN) //fade IN
+ sleep(0.1 SECONDS)
if(!M)
return
M.visible_message("[span_hierophant_warning("[M] fades in!")]")
@@ -1441,7 +1441,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
return
new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, user)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
- sleep(2)
+ sleep(0.2 SECONDS)
var/obj/effect/temp_visual/hierophant/blast/B = new(T, user, friendly_fire_check)
B.damage = HIEROPHANT_CLUB_CARDINAL_DAMAGE
B.monster_damage_boost = FALSE
@@ -1468,7 +1468,7 @@ GLOBAL_LIST_EMPTY(bloodmen_list)
return
new /obj/effect/temp_visual/hierophant/telegraph(T, user)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
- sleep(2)
+ sleep(0.2 SECONDS)
for(var/t in RANGE_TURFS(1, T))
var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check)
B.damage = 15 //keeps monster damage boost due to lower damage
diff --git a/code/modules/mining/lavaland/ruins/gym.dm b/code/modules/mining/lavaland/ruins/gym.dm
index cf72bccfb195..54d4a61cabf5 100644
--- a/code/modules/mining/lavaland/ruins/gym.dm
+++ b/code/modules/mining/lavaland/ruins/gym.dm
@@ -65,11 +65,11 @@
while (lifts++ < 6)
if (user.loc != src.loc)
break
- sleep(3)
- animate(user, pixel_y = -2, time = 3)
- sleep(3)
- animate(user, pixel_y = -4, time = 3)
- sleep(3)
+ sleep(0.3 SECONDS)
+ animate(user, pixel_y = -2, time = 0.3 SECONDS)
+ sleep(0.3 SECONDS)
+ animate(user, pixel_y = -4, time = 0.3 SECONDS)
+ sleep(0.3 SECONDS)
playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
/obj/structure/weightmachine/weightlifter
@@ -86,10 +86,10 @@
if (user.loc != src.loc)
break
for (var/innerReps = max(reps, 1), innerReps > 0, innerReps--)
- sleep(3)
- animate(user, pixel_y = (user.pixel_y == 3) ? 5 : 3, time = 3)
+ sleep(0.3 SECONDS)
+ animate(user, pixel_y = (user.pixel_y == 3) ? 5 : 3, time = 0.3 SECONDS)
playsound(user, 'goon/sound/effects/spring.ogg', 60, 1)
- sleep(3)
- animate(user, pixel_y = 2, time = 3)
- sleep(3)
+ sleep(0.3 SECONDS)
+ animate(user, pixel_y = 2, time = 0.3 SECONDS)
+ sleep(0.3 SECONDS)
cut_overlay(swole_overlay)
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index 95389c9dd544..3f75fe5e85ec 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -87,7 +87,7 @@
coinsToProduce--
newCoins++
src.updateUsrDialog()
- sleep(5)
+ sleep(0.5 SECONDS)
icon_state = "coinpress0"
processing = FALSE
@@ -103,4 +103,4 @@
if(!M)
M = new /obj/item/storage/bag/money(src)
unload_mineral(M)
- O.forceMove(M)
\ No newline at end of file
+ O.forceMove(M)
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 41fdb3dcd4bc..a9696aad1277 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -486,7 +486,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
icon_state = "coin_[cmineral]_[coinflip]"
playsound(user.loc, 'sound/items/coinflip.ogg', 50, 1)
var/oldloc = loc
- sleep(15)
+ sleep(1.5 SECONDS)
if(loc == oldloc && user && !user.incapacitated())
user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
span_notice("You flip [src]. It lands on [coinflip]."), \
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 85bf064e9284..abb2e1fc3c12 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -90,7 +90,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
new /obj/screen/splash(C)
notransform = TRUE
- sleep(29) //let the animation play
+ sleep(2.9 SECONDS) //let the animation play
notransform = FALSE
if(!C)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 1392d5ae3301..231877ebb78f 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -128,7 +128,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
remove_verb(src, /mob/dead/observer/verb/boo)
remove_verb(src, /mob/dead/observer/verb/possess)
- animate(src, pixel_y = 2, time = 10, loop = -1)
+ animate(src, pixel_y = 2, time = 1 SECONDS, loop = -1)
add_to_dead_mob_list()
@@ -151,13 +151,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
/mob/dead/observer/narsie_act()
var/old_color = color
color = "#960000"
- animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL)
+ animate(src, color = old_color, time = 1 SECONDS, flags = ANIMATION_PARALLEL)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10)
/mob/dead/observer/ratvar_act()
var/old_color = color
color = "#FAE48C"
- animate(src, color = old_color, time = 10, flags = ANIMATION_PARALLEL)
+ animate(src, color = old_color, time = 1 SECONDS, flags = ANIMATION_PARALLEL)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 10)
/mob/dead/observer/Destroy()
@@ -476,7 +476,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
. = ..()
//restart our floating animation after orbit is done.
pixel_y = 0
- animate(src, pixel_y = 2, time = 10, loop = -1)
+ animate(src, pixel_y = 2, time = 1 SECONDS, loop = -1)
/mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost"
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index a926c2fbd74b..1b56853f1d09 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -76,7 +76,7 @@
for(var/i in 1 to 3)
playsound(get_turf(src),sound, 50, 1)
- sleep(30)
+ sleep(3 SECONDS)
if(!victim)
return FALSE
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index 4c3c52616ec3..10a34972fe60 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -70,16 +70,16 @@
blocked = TRUE
if(!blocked)
L.visible_message("[src] pounces on [L]!", "[src] pounces on you!")
- L.Paralyze(100)
- sleep(2)//Runtime prevention (infinite bump() calls on hulks)
+ L.Paralyze(10 SECONDS)
+ sleep(0.2 SECONDS)//Runtime prevention (infinite bump() calls on hulks)
step_towards(src,L)
else
- Paralyze(40, 1, 1)
+ Paralyze(4 SECONDS, 1, 1)
toggle_leap(0)
else if(hit_atom.density && !hit_atom.CanPass(src))
visible_message("[src] smashes into [hit_atom]!", "[src] smashes into [hit_atom]!")
- Paralyze(40, 1, 1)
+ Paralyze(4 SECONDS, 1, 1)
if(leaping)
leaping = FALSE
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index 7f5889833b77..b52c6e331ebb 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -7,7 +7,7 @@
var/hitverb = "punched"
if(mob_size < MOB_SIZE_LARGE)
step_away(src,user,15)
- sleep(1)
+ sleep(0.1 SECONDS)
step_away(src,user,15)
hitverb = "slammed"
playsound(loc, "punch", 25, 1, -1)
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index 68515bc26737..3cfd2f02a1e9 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -105,7 +105,7 @@
new_xeno.notransform = 1
new_xeno.invisibility = INVISIBILITY_MAXIMUM
- sleep(6)
+ sleep(0.6 SECONDS)
if(QDELETED(src) || QDELETED(owner))
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 9393e24fd022..8ab17b84b684 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -329,11 +329,11 @@
/mob/living/carbon/resist_fire()
fire_stacks -= 5
- Paralyze(60, TRUE, TRUE)
+ Paralyze(6 SECONDS, TRUE, TRUE)
spin(32,2)
visible_message(span_danger("[src] rolls on the floor, trying to put [p_them()]self out!"), \
span_notice("You stop, drop, and roll!"))
- sleep(30)
+ sleep(3 SECONDS)
if(fire_stacks <= 0)
visible_message(span_danger("[src] has successfully extinguished [p_them()]self!"), \
span_notice("You extinguish yourself."))
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 80e124211700..02e12c25b47f 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -510,7 +510,7 @@
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "jaunt"
icon_icon = 'icons/mob/actions/actions_spells.dmi'
- var/cooldown = 150
+ var/cooldown = 15 SECONDS
var/last_teleport = 0
/datum/action/innate/unstable_teleport/IsAvailable()
@@ -534,7 +534,7 @@
do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
last_teleport = world.time
UpdateButtonIcon() //action icon looks unavailable
- sleep(cooldown + 5)
+ sleep(cooldown + 0.5 SECONDS)
UpdateButtonIcon() //action icon looks available again
@@ -828,7 +828,7 @@
new /obj/effect/temp_visual/mummy_animation(get_turf(src))
if(cloth_golem.revive(full_heal = TRUE, admin_revive = TRUE))
cloth_golem.grab_ghost() //won't pull if it's a suicide
- sleep(20)
+ sleep(2 SECONDS)
cloth_golem.forceMove(get_turf(src))
cloth_golem.visible_message(span_danger("[src] rises and reforms into [cloth_golem]!"),span_userdanger("You reform into yourself!"))
cloth_golem = null
@@ -1459,7 +1459,7 @@
new /obj/effect/temp_visual/wax_animation(get_turf(src))
if(wax_golem.revive(full_heal = TRUE, admin_revive = TRUE))
wax_golem.grab_ghost() //won't pull if it's a suicide
- sleep(20)
+ sleep(2 SECONDS)
wax_golem.forceMove(get_turf(src))
wax_golem.visible_message(span_danger("[src] rises and reforms into [wax_golem]!"),span_userdanger("You reform into yourself!"))
wax_golem = null
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index c1a2bc8dd8a8..6ceb332b57f1 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -475,7 +475,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
temp = amplitude * cos(saved_dizz * world.time)
pixel_y_diff += temp
C.pixel_y += temp
- sleep(3)
+ sleep(0.3 SECONDS)
if(C)
temp = amplitude * sin(saved_dizz * world.time)
pixel_x_diff += temp
@@ -483,7 +483,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
temp = amplitude * cos(saved_dizz * world.time)
pixel_y_diff += temp
C.pixel_y += temp
- sleep(3)
+ sleep(0.3 SECONDS)
if(C)
C.pixel_x -= pixel_x_diff
C.pixel_y -= pixel_y_diff
diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index 99444d3a2576..a02b253df456 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -43,7 +43,7 @@
// failed to path correctly so just try to head straight for a bit
walk_to(src,get_turf(target),0,5)
- sleep(1)
+ sleep(0.1 SECONDS)
walk_to(src,0)
return 0
@@ -103,7 +103,7 @@
/mob/living/carbon/monkey/proc/pickup_and_wear(var/obj/item/clothing/C)
if(!equip_to_appropriate_slot(C))
monkeyDrop(get_item_by_slot(C)) // remove the existing item if worn
- sleep(5)
+ sleep(0.5 SECONDS)
equip_to_appropriate_slot(C)
/mob/living/carbon/monkey/resist_restraints()
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index cc2d45b90173..5dc538ee5cfa 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -22,7 +22,7 @@
resize = RESIZE_DEFAULT_SIZE
if(changed)
- animate(src, transform = ntransform, time = 2, pixel_y = final_pixel_y, dir = final_dir, easing = EASE_IN|EASE_OUT)
+ animate(src, transform = ntransform, time = 0.2 SECONDS, pixel_y = final_pixel_y, dir = final_dir, easing = EASE_IN|EASE_OUT)
setMovetype(movement_type & ~FLOATING) // If we were without gravity, the bouncing animation got stopped, so we make sure we restart it in next life().
/mob/living/carbon
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 0319db88ff57..856f26469bda 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -160,9 +160,9 @@
INVOKE_ASYNC(src, .proc/gravity_pulse_animation)
/mob/living/proc/gravity_pulse_animation()
- animate(get_filter("gravity"), y = 1, time = 10)
- sleep(10)
- animate(get_filter("gravity"), y = 0, time = 10)
+ animate(get_filter("gravity"), y = 1, time = 1 SECONDS)
+ sleep(1 SECONDS)
+ animate(get_filter("gravity"), y = 0, time = 1 SECONDS)
/mob/living/proc/handle_high_gravity(gravity)
if(gravity >= GRAVITY_DAMAGE_TRESHOLD) //Aka gravity values of 3 or more
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 307cdb9b64a0..4c2209f336bb 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -832,12 +832,12 @@
if(anchored || (buckled && buckled.anchored))
fixed = 1
if(on && !(movement_type & FLOATING) && !fixed)
- animate(src, pixel_y = pixel_y + 2, time = 10, loop = -1)
- sleep(10)
- animate(src, pixel_y = pixel_y - 2, time = 10, loop = -1)
+ animate(src, pixel_y = pixel_y + 2, time = 1 SECONDS, loop = -1)
+ sleep(1 SECONDS)
+ animate(src, pixel_y = pixel_y - 2, time = 1 SECONDS, loop = -1)
setMovetype(movement_type | FLOATING)
else if(((!on || fixed) && (movement_type & FLOATING)))
- animate(src, pixel_y = get_standard_pixel_y_offset(lying), time = 10)
+ animate(src, pixel_y = get_standard_pixel_y_offset(lying), time = 1 SECONDS)
setMovetype(movement_type & ~FLOATING)
// The src mob is trying to strip an item from someone
@@ -914,8 +914,8 @@
var/pixel_y_diff = rand(-amplitude/3, amplitude/3)
var/final_pixel_x = get_standard_pixel_x_offset(lying)
var/final_pixel_y = get_standard_pixel_y_offset(lying)
- animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff , time = 2, loop = 6)
- animate(pixel_x = final_pixel_x , pixel_y = final_pixel_y , time = 2)
+ animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff , time = 0.2 SECONDS, loop = 6)
+ animate(pixel_x = final_pixel_x , pixel_y = final_pixel_y , time = 0.2 SECONDS)
setMovetype(movement_type & ~FLOATING) // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life().
/mob/living/proc/get_temperature(datum/gas_mixture/environment)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index b92f64fb2129..834243c2598e 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -265,7 +265,7 @@
var/obj/machinery/ai/data_core/core = loc
forceMove(get_turf(loc))
view_core()
- sleep(1)
+ sleep(0.1 SECONDS)
forceMove(core)
/mob/living/silicon/ai/verb/pick_icon()
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 70b4ce9b818e..3f6d2fb6df78 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -126,7 +126,7 @@
/mob/living/silicon/ai/proc/start_RestorePowerRoutine()
to_chat(src, "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.")
end_multicam()
- sleep(50)
+ sleep(5 SECONDS)
var/turf/T = get_turf(loc)
var/area/AIarea = get_area(loc)
if(AIarea && AIarea.power_equip)
@@ -134,16 +134,16 @@
ai_restore_power()
return
to_chat(src, "Fault confirmed: missing external power. Shutting down main control system to save power.")
- sleep(20)
+ sleep(2 SECONDS)
to_chat(src, "Emergency control system online. Verifying connection to power network.")
- sleep(50)
+ sleep(5 SECONDS)
T = get_turf(loc)
if(isspaceturf(T))
to_chat(src, "Unable to verify! No power connection detected!")
aiRestorePowerRoutine = POWER_RESTORATION_SEARCH_APC
return
to_chat(src, "Connection verified. Searching for APC in power network.")
- sleep(50)
+ sleep(5 SECONDS)
var/obj/machinery/power/apc/theAPC = null
var/PRP //like ERP with the code, at least this stuff is no more 4x sametext
@@ -176,14 +176,14 @@
to_chat(src, "Power port upload access confirmed. Loading control program into APC power port software.")
if (4)
to_chat(src, "Transfer complete. Forcing APC to execute program.")
- sleep(50)
+ sleep(5 SECONDS)
to_chat(src, "Receiving control information from APC.")
- sleep(2)
+ sleep(0.2 SECONDS)
apc_override = 1
theAPC.ui_interact(src)
apc_override = 0
aiRestorePowerRoutine = POWER_RESTORATION_APC_FOUND
- sleep(50)
+ sleep(5 SECONDS)
theAPC = null
/mob/living/silicon/ai/proc/ai_restore_power()
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 3438012a6c87..043ca3cd1f68 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -67,7 +67,7 @@
spark_system.start()
spawn(0)
step_away(src,user,15)
- sleep(3)
+ sleep(0.3 SECONDS)
step_away(src,user,15)
/mob/living/silicon/robot/fire_act()
@@ -137,20 +137,20 @@
GLOB.lawchanges.Add("[time] : [user.name]([user.key]) emagged [name]([key])")
to_chat(src, span_danger("ALERT: Foreign software detected."))
logevent("ALERT: Foreign software detected.")
- sleep(5)
+ sleep(0.5 SECONDS)
to_chat(src, span_danger("Initiating diagnostics..."))
- sleep(20)
+ sleep(2 SECONDS)
to_chat(src, span_danger("SynBorg v1.7 loaded."))
logevent("WARN: root privleges granted to PID [num2hex(rand(1,65535), -1)][num2hex(rand(1,65535), -1)].") //random eight digit hex value. Two are used because rand(1,4294967295) throws an error
- sleep(5)
+ sleep(0.5 SECONDS)
to_chat(src, span_danger("LAW SYNCHRONISATION ERROR"))
- sleep(5)
+ sleep(0.5 SECONDS)
if(user)
logevent("LOG: New user \[[replacetext(user.real_name," ","")]\], groups \[root\]")
to_chat(src, span_danger("Would you like to send a report to NanoTraSoft? Y/N"))
- sleep(10)
+ sleep(1 SECONDS)
to_chat(src, span_danger("> N"))
- sleep(20)
+ sleep(2 SECONDS)
to_chat(src, span_danger("ERRORERRORERROR"))
to_chat(src, span_danger("ALERT: [user.real_name] is your new master. Obey your new laws and [user.p_their()] commands."))
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index e5ed8b85509c..f1562c7ec604 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -226,16 +226,16 @@
/obj/item/robot_module/proc/do_transform_delay()
var/mob/living/silicon/robot/R = loc
var/prev_lockcharge = R.lockcharge
- sleep(1)
+ sleep(0.1 SECONDS)
flick("[cyborg_base_icon]_transform", R)
R.notransform = TRUE
R.SetLockdown(1)
R.anchored = TRUE
R.logevent("Chassis configuration has been set to [name].")
- sleep(1)
+ sleep(0.1 SECONDS)
for(var/i in 1 to 4)
playsound(R, pick('sound/items/drill_use.ogg', 'sound/items/jaws_cut.ogg', 'sound/items/jaws_pry.ogg', 'sound/items/welder.ogg', 'sound/items/ratchet.ogg'), 80, 1, -1)
- sleep(7)
+ sleep(0.7 SECONDS)
if(!prev_lockcharge)
R.SetLockdown(0)
R.setDir(SOUTH)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 3e829412b2e7..b8439601ed73 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -217,19 +217,19 @@
//laws_sanity_check()
//laws.show_laws(world)
var/number = 1
- sleep(10)
+ sleep(1 SECONDS)
if (laws.devillaws && laws.devillaws.len)
for(var/index = 1, index <= laws.devillaws.len, index++)
if (force || devillawcheck[index] == "Yes")
say("[radiomod] 666. [laws.devillaws[index]]")
- sleep(10)
+ sleep(1 SECONDS)
if (laws.zeroth)
if (force || lawcheck[1] == "Yes")
say("[radiomod] 0. [laws.zeroth]")
- sleep(10)
+ sleep(1 SECONDS)
for (var/index = 1, index <= laws.hacked.len, index++)
var/law = laws.hacked[index]
@@ -237,7 +237,7 @@
if (length(law) > 0)
if (force || hackedcheck[index] == "Yes")
say("[radiomod] [num]. [law]")
- sleep(10)
+ sleep(1 SECONDS)
for (var/index = 1, index <= laws.ion.len, index++)
var/law = laws.ion[index]
@@ -245,7 +245,7 @@
if (length(law) > 0)
if (force || ioncheck[index] == "Yes")
say("[radiomod] [num]. [law]")
- sleep(10)
+ sleep(1 SECONDS)
for (var/index = 1, index <= laws.inherent.len, index++)
var/law = laws.inherent[index]
@@ -254,7 +254,7 @@
if (force || lawcheck[index+1] == "Yes")
say("[radiomod] [number]. [law]")
number++
- sleep(10)
+ sleep(1 SECONDS)
for (var/index = 1, index <= laws.supplied.len, index++)
var/law = laws.supplied[index]
@@ -264,7 +264,7 @@
if (force || lawcheck[number+1] == "Yes")
say("[radiomod] [number]. [law]")
number++
- sleep(10)
+ sleep(1 SECONDS)
/mob/living/silicon/proc/checklaws() //Gives you a link-driven interface for deciding what laws the statelaws() proc will share with the crew. --NeoFite
@@ -411,7 +411,7 @@
resize = RESIZE_DEFAULT_SIZE
if(changed)
- animate(src, transform = ntransform, time = 2,easing = EASE_IN|EASE_OUT)
+ animate(src, transform = ntransform, time = 0.2 SECONDS,easing = EASE_IN|EASE_OUT)
return ..()
/mob/living/silicon/is_literate()
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index b587ae6d4cd2..59f72ee2fd8b 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -320,7 +320,7 @@
icon_state = "[toolbox_color]floorbot-c"
visible_message(span_notice("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] "))
mode = BOT_REPAIRING
- sleep(50)
+ sleep(5 SECONDS)
if(mode == BOT_REPAIRING && src.loc == target_turf)
if(autotile) //Build the floor and include a tile.
target_turf.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
@@ -335,7 +335,7 @@
icon_state = "[toolbox_color]floorbot-c"
mode = BOT_REPAIRING
visible_message(span_notice("[src] begins repairing the floor."))
- sleep(50)
+ sleep(5 SECONDS)
if(mode == BOT_REPAIRING && F && src.loc == F)
F.broken = FALSE
F.burnt = FALSE
@@ -346,7 +346,7 @@
icon_state = "[toolbox_color]floorbot-c"
mode = BOT_REPAIRING
visible_message(span_notice("[src] begins replacing the floor tiles."))
- sleep(50)
+ sleep(5 SECONDS)
if(mode == BOT_REPAIRING && F && src.loc == F)
F.broken = FALSE
F.burnt = FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 71cf0002e22a..30e475ace852 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -285,7 +285,7 @@
step_rand(item_to_add)
for(var/i in list(1,2,4,8,4,8,4,dir))
setDir(i)
- sleep(1)
+ sleep(0.1 SECONDS)
return
item_to_add.forceMove(src)
@@ -347,7 +347,7 @@
step_rand(item_to_add)
for(var/i in list(1,2,4,8,4,8,4,dir))
setDir(i)
- sleep(1)
+ sleep(0.1 SECONDS)
return valid
@@ -481,9 +481,9 @@
if(movement_target)
stop_automated_movement = 1
step_to(src,movement_target,1)
- sleep(3)
+ sleep(0.3 SECONDS)
step_to(src,movement_target,1)
- sleep(3)
+ sleep(0.3 SECONDS)
step_to(src,movement_target,1)
if(movement_target) //Not redundant due to sleeps, Item can be gone in 6 decisecomds
@@ -515,7 +515,7 @@
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
setDir(i)
- sleep(1)
+ sleep(0.1 SECONDS)
/mob/living/simple_animal/pet/dog/corgi/Ian/narsie_act()
playsound(src, 'sound/magic/demon_dies.ogg', 75, TRUE)
@@ -676,7 +676,7 @@
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
setDir(i)
- sleep(1)
+ sleep(0.1 SECONDS)
/mob/living/simple_animal/pet/dog/pug/Life()
..()
@@ -687,7 +687,7 @@
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
setDir(i)
- sleep(1)
+ sleep(0.1 SECONDS)
/mob/living/simple_animal/pet/dog/attack_hand(mob/living/carbon/human/M)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm
index 9e0d7236a359..5c6030fa1692 100644
--- a/code/modules/mob/living/simple_animal/friendly/pet.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pet.dm
@@ -48,7 +48,7 @@
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2))
setDir(i)
- sleep(1)
+ sleep(0.1 SECONDS)
else
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm
index 2f23b333eb4a..26f3e9678e37 100644
--- a/code/modules/mob/living/simple_animal/hostile/goose.dm
+++ b/code/modules/mob/living/simple_animal/hostile/goose.dm
@@ -103,7 +103,7 @@
var/destination = get_edge_target_turf(currentTurf, pick(GLOB.alldirs)) //Pick a random direction to toss them in
var/throwRange = hard ? rand(2,8) : 1
consumed.safe_throw_at(destination, throwRange, 2) //Thow the food at a random tile 1 spot away
- sleep(2)
+ sleep(0.2 SECONDS)
if (QDELETED(src) || QDELETED(consumed))
return
currentTurf = get_turf(consumed)
@@ -123,7 +123,7 @@
/mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit_preend()
for (var/obj/item/consumed in contents) //Get rid of any food left in the poor thing
barf_food(consumed, TRUE)
- sleep(1)
+ sleep(0.1 SECONDS)
if (QDELETED(src))
return
vomit_end()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 770856b6a8bb..09cd436e72f8 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -234,7 +234,7 @@ Difficulty: Medium
playsound(own_turf, 'sound/weapons/punchmiss.ogg', 40, 1, -1)
dashing = TRUE
alpha = 0
- animate(src, alpha = 255, time = 5)
+ animate(src, alpha = 255, time = 0.5 SECONDS)
SLEEP_CHECK_DEATH(2)
D.forceMove(step_forward_turf)
forceMove(target_turf)
@@ -271,11 +271,11 @@ Difficulty: Medium
if(dir & (EAST|WEST)) //Facing east or west
final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
- animate(src, transform = M, pixel_y = -6, dir = final_dir, time = 2, easing = EASE_IN|EASE_OUT)
- sleep(5)
- animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 10, easing = EASE_IN, flags = ANIMATION_PARALLEL)
- sleep(4)
- animate(src, alpha = 0, time = 6, easing = EASE_OUT, flags = ANIMATION_PARALLEL)
+ animate(src, transform = M, pixel_y = -6, dir = final_dir, time = 0.2 SECONDS, easing = EASE_IN|EASE_OUT)
+ sleep(0.5 SECONDS)
+ animate(src, color = list("#A7A19E", "#A7A19E", "#A7A19E", list(0, 0, 0)), time = 1 SECONDS, easing = EASE_IN, flags = ANIMATION_PARALLEL)
+ sleep(0.4 SECONDS)
+ animate(src, alpha = 0, time = 0.6 SECONDS, easing = EASE_OUT, flags = ANIMATION_PARALLEL)
/obj/item/gps/internal/miner
icon_state = null
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 88ee61285ee8..2572baebe642 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -187,7 +187,7 @@ Difficulty: Hard
walk(src, 0)
setDir(dir)
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
- animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 3)
+ animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 0.3 SECONDS)
SLEEP_CHECK_DEATH(delay)
revving_charge = FALSE
var/movespeed = 0.7
@@ -294,7 +294,7 @@ Difficulty: Hard
DA.color = "#FF0000"
var/oldtransform = DA.transform
DA.transform = matrix()*2
- animate(DA, alpha = 255, color = initial(DA.color), transform = oldtransform, time = 3)
+ animate(DA, alpha = 255, color = initial(DA.color), transform = oldtransform, time = 0.3 SECONDS)
SLEEP_CHECK_DEATH(3)
qdel(DA)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 891f1a9d185a..0b3f7a9f5daa 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -222,22 +222,22 @@ Difficulty: Extremely Hard
P.original = target
P.fire()
SLEEP_CHECK_DEATH(8)
- SetRecoveryTime(15, 20)
+ SetRecoveryTime(1.5 SECONDS, 2 SECONDS)
/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/proc/check_enraged()
if(health <= maxHealth*0.25 && !enraged)
- SetRecoveryTime(80, 80)
+ SetRecoveryTime(8 SECONDS, 8 SECONDS)
adjustHealth(-maxHealth)
enraged = TRUE
enraging = TRUE
- animate(src, pixel_y = pixel_y + 96, time = 100, easing = ELASTIC_EASING)
- spin(100, 10)
- SLEEP_CHECK_DEATH(60)
+ animate(src, pixel_y = pixel_y + 96, time = 10 SECONDS, easing = ELASTIC_EASING)
+ spin(10 SECONDS, 1 SECONDS)
+ SLEEP_CHECK_DEATH(6 SECONDS)
playsound(src, 'sound/effects/explosion3.ogg', 100, TRUE)
overlays += mutable_appearance('icons/effects/effects.dmi', "curse")
- animate(src, pixel_y = pixel_y - 96, time = 8, flags = ANIMATION_END_NOW)
- spin(8, 2)
- SLEEP_CHECK_DEATH(8)
+ animate(src, pixel_y = pixel_y - 96, time = 0.8 SECONDS, flags = ANIMATION_END_NOW)
+ spin(0.8 SECONDS, 0.2 SECONDS)
+ SLEEP_CHECK_DEATH(0.8 SECONDS)
for(var/mob/living/L in viewers(src))
shake_camera(L, 3, 2)
playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index 0d69229c70d9..0b8c5c7e18df 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -286,7 +286,7 @@ Difficulty: Medium
continue
hit_list += M
M.take_damage(45, BRUTE, MELEE, 1)
- sleep(1.5)
+ sleep(0.15 SECONDS)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(lava_arena = FALSE, atom/movable/manual_target, var/swoop_cooldown = 30)
if(stat || swooping)
@@ -315,16 +315,16 @@ Difficulty: Medium
var/oldtransform = transform
alpha = 255
- animate(src, alpha = 204, transform = matrix()*0.9, time = 3, easing = BOUNCE_EASING)
+ animate(src, alpha = 204, transform = matrix()*0.9, time = 0.3 SECONDS, easing = BOUNCE_EASING)
for(var/i in 1 to 3)
- sleep(1)
+ sleep(0.1 SECONDS)
if(QDELETED(src) || stat == DEAD) //we got hit and died, rip us
qdel(F)
if(stat == DEAD)
swooping &= ~SWOOP_DAMAGEABLE
- animate(src, alpha = 255, transform = oldtransform, time = 0, flags = ANIMATION_END_NOW) //reset immediately
+ animate(src, alpha = 255, transform = oldtransform, time = 0 SECONDS, flags = ANIMATION_END_NOW) //reset immediately
return
- animate(src, alpha = 100, transform = matrix()*0.7, time = 7)
+ animate(src, alpha = 100, transform = matrix()*0.7, time = 0.7 SECONDS)
swooping |= SWOOP_INVULNERABLE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
SLEEP_CHECK_DEATH(7)
@@ -334,7 +334,7 @@ Difficulty: Medium
SLEEP_CHECK_DEATH(0.5)
// Ash drake flies onto its target and rains fire down upon them
- var/descentTime = 10
+ var/descentTime = 1 SECONDS
var/lava_success = TRUE
if(lava_arena)
lava_success = lava_arena()
@@ -429,12 +429,12 @@ Difficulty: Medium
icon_state = "lavastaff_warn"
layer = BELOW_MOB_LAYER
light_range = 2
- duration = 13
+ duration = 1.3 SECONDS
/obj/effect/temp_visual/lava_warning/ex_act()
return
-/obj/effect/temp_visual/lava_warning/Initialize(mapload, var/reset_time = 10)
+/obj/effect/temp_visual/lava_warning/Initialize(mapload, var/reset_time = 1 SECONDS)
. = ..()
INVOKE_ASYNC(src, .proc/fall, reset_time)
src.alpha = 63.75
@@ -473,7 +473,7 @@ Difficulty: Medium
opacity = 0
density = TRUE
CanAtmosPass = ATMOS_PASS_DENSITY
- duration = 82
+ duration = 8.2 SECONDS
color = COLOR_DARK_ORANGE
/obj/effect/temp_visual/lava_safe
@@ -481,7 +481,7 @@ Difficulty: Medium
icon_state = "trap-earth"
layer = BELOW_MOB_LAYER
light_range = 2
- duration = 13
+ duration = 1.3 SECONDS
/obj/effect/temp_visual/dragon_swoop
name = "certain death"
@@ -492,14 +492,14 @@ Difficulty: Medium
pixel_x = -32
pixel_y = -32
color = "#FF0000"
- duration = 10
+ duration = 1 SECONDS
/obj/effect/temp_visual/dragon_flight
icon = 'icons/mob/lavaland/64x64megafauna.dmi'
icon_state = "dragon"
layer = ABOVE_ALL_MOB_LAYER
pixel_x = -16
- duration = 10
+ duration = 1 SECONDS
randomdir = FALSE
/obj/effect/temp_visual/dragon_flight/Initialize(mapload, negative)
@@ -508,27 +508,27 @@ Difficulty: Medium
/obj/effect/temp_visual/dragon_flight/proc/flight(negative)
if(negative)
- animate(src, pixel_x = -DRAKE_SWOOP_HEIGHT*0.1, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING)
+ animate(src, pixel_x = -DRAKE_SWOOP_HEIGHT*0.1, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 0.3 SECONDS, easing = BOUNCE_EASING)
else
- animate(src, pixel_x = DRAKE_SWOOP_HEIGHT*0.1, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING)
- sleep(3)
+ animate(src, pixel_x = DRAKE_SWOOP_HEIGHT*0.1, pixel_z = DRAKE_SWOOP_HEIGHT*0.15, time = 0.3 SECONDS, easing = BOUNCE_EASING)
+ sleep(0.3 SECONDS)
icon_state = "swoop"
if(negative)
- animate(src, pixel_x = -DRAKE_SWOOP_HEIGHT, pixel_z = DRAKE_SWOOP_HEIGHT, time = 7)
+ animate(src, pixel_x = -DRAKE_SWOOP_HEIGHT, pixel_z = DRAKE_SWOOP_HEIGHT, time = 0.7 SECONDS)
else
- animate(src, pixel_x = DRAKE_SWOOP_HEIGHT, pixel_z = DRAKE_SWOOP_HEIGHT, time = 7)
+ animate(src, pixel_x = DRAKE_SWOOP_HEIGHT, pixel_z = DRAKE_SWOOP_HEIGHT, time = 0.7 SECONDS)
/obj/effect/temp_visual/dragon_flight/end
pixel_x = DRAKE_SWOOP_HEIGHT
pixel_z = DRAKE_SWOOP_HEIGHT
- duration = 10
+ duration = 1 SECONDS
/obj/effect/temp_visual/dragon_flight/end/flight(negative)
if(negative)
pixel_x = -DRAKE_SWOOP_HEIGHT
- animate(src, pixel_x = -16, pixel_z = 0, time = 5)
+ animate(src, pixel_x = -16, pixel_z = 0, time = 0.5 SECONDS)
else
- animate(src, pixel_x = -16, pixel_z = 0, time = 5)
+ animate(src, pixel_x = -16, pixel_z = 0, time = 0.5 SECONDS)
obj/effect/temp_visual/fireball
icon = 'icons/obj/wizard.dmi'
@@ -537,7 +537,7 @@ obj/effect/temp_visual/fireball
desc = "Get out of the way!"
layer = FLY_LAYER
randomdir = FALSE
- duration = 9
+ duration = 0.9 SECONDS
pixel_z = 270
/obj/effect/temp_visual/fireball/Initialize()
@@ -549,7 +549,7 @@ obj/effect/temp_visual/fireball
icon_state = "sniper_zoom"
layer = BELOW_MOB_LAYER
light_range = 2
- duration = 9
+ duration = 0.9 SECONDS
/obj/effect/temp_visual/target/ex_act()
return
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index f371a6d623b4..2a436a493bc4 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -199,8 +199,8 @@ Difficulty: Hard
if(health < maxHealth * 0.5 && blink_counter > 1)
visible_message(span_hierophant("\"Mx ampp rsx iwgeti.\""))
var/oldcolor = color
- animate(src, color = "#660099", time = 6)
- SLEEP_CHECK_DEATH(6)
+ animate(src, color = "#660099", time = 0.6 SECONDS)
+ SLEEP_CHECK_DEATH(0.6 SECONDS)
while(!QDELETED(target) && blink_counter)
if(loc == target.loc || loc == target) //we're on the same tile as them after about a second we can stop now
break
@@ -208,10 +208,10 @@ Difficulty: Hard
blinking = FALSE
blink(target)
blinking = TRUE
- SLEEP_CHECK_DEATH(4 + target_slowness)
- animate(src, color = oldcolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
- SLEEP_CHECK_DEATH(8)
+ SLEEP_CHECK_DEATH(0.4 SECONDS + target_slowness)
+ animate(src, color = oldcolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
+ SLEEP_CHECK_DEATH(0.8 SECONDS)
blinking = FALSE
else
blink(target)
@@ -221,8 +221,8 @@ Difficulty: Hard
visible_message(span_hierophant("\"Piezi mx rsalivi xs vyr.\""))
blinking = TRUE
var/oldcolor = color
- animate(src, color = "#660099", time = 6)
- SLEEP_CHECK_DEATH(6)
+ animate(src, color = "#660099", time = 0.6 SECONDS)
+ SLEEP_CHECK_DEATH(0.6 SECONDS)
while(!QDELETED(target) && cross_counter)
cross_counter--
if(prob(60))
@@ -230,9 +230,9 @@ Difficulty: Hard
else
INVOKE_ASYNC(src, .proc/blasts, target, GLOB.diagonals)
SLEEP_CHECK_DEATH(6 + target_slowness)
- animate(src, color = oldcolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
- SLEEP_CHECK_DEATH(8)
+ animate(src, color = oldcolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
+ SLEEP_CHECK_DEATH(0.8 SECONDS)
blinking = FALSE
@@ -241,8 +241,8 @@ Difficulty: Hard
visible_message(span_hierophant("\"Mx gerrsx lmhi.\""))
blinking = TRUE
var/oldcolor = color
- animate(src, color = "#660099", time = 6)
- SLEEP_CHECK_DEATH(6)
+ animate(src, color = "#660099", time = 0.6 SECONDS)
+ SLEEP_CHECK_DEATH(0.6 SECONDS)
var/list/targets = ListTargets()
var/list/cardinal_copy = GLOB.cardinals.Copy()
while(targets.len && cardinal_copy.len)
@@ -256,11 +256,11 @@ Difficulty: Hard
var/obj/effect/temp_visual/hierophant/chaser/C = new(loc, src, pickedtarget, chaser_speed, FALSE)
C.moving = 3
C.moving_dir = pick_n_take(cardinal_copy)
- SLEEP_CHECK_DEATH(8 + target_slowness)
+ SLEEP_CHECK_DEATH(0.8 SECONDS + target_slowness)
chaser_cooldown = world.time + initial(chaser_cooldown)
- animate(src, color = oldcolor, time = 8)
- addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
- SLEEP_CHECK_DEATH(8)
+ animate(src, color = oldcolor, time = 0.8 SECONDS)
+ addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS)
+ SLEEP_CHECK_DEATH(0.8 SECONDS)
blinking = FALSE
/mob/living/simple_animal/hostile/megafauna/hierophant/proc/blasts(mob/victim, var/list/directions = GLOB.cardinals) //fires cross blasts with a delay
@@ -324,7 +324,7 @@ Difficulty: Hard
playsound(T,'sound/magic/wand_teleport.ogg', 200, 1)
playsound(source,'sound/machines/airlockopen.ogg', 200, 1)
blinking = TRUE
- SLEEP_CHECK_DEATH(2) //short delay before we start...
+ SLEEP_CHECK_DEATH(0.2 SECONDS) //short delay before we start...
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, src)
for(var/t in RANGE_TURFS(1, T))
@@ -333,18 +333,18 @@ Difficulty: Hard
for(var/t in RANGE_TURFS(1, source))
var/obj/effect/temp_visual/hierophant/blast/B = new(t, src, FALSE)
B.damage = 30
- animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
- SLEEP_CHECK_DEATH(1)
+ animate(src, alpha = 0, time = 0.2 SECONDS, easing = EASE_OUT) //fade out
+ SLEEP_CHECK_DEATH(0.1 SECONDS)
visible_message("[span_hierophant_warning("[src] fades out!")]")
density = FALSE
- SLEEP_CHECK_DEATH(2)
+ SLEEP_CHECK_DEATH(0.2 SECONDS)
forceMove(T)
- SLEEP_CHECK_DEATH(1)
- animate(src, alpha = 255, time = 2, easing = EASE_IN) //fade IN
- SLEEP_CHECK_DEATH(1)
+ SLEEP_CHECK_DEATH(0.1 SECONDS)
+ animate(src, alpha = 255, time = 0.2 SECONDS, easing = EASE_IN) //fade IN
+ SLEEP_CHECK_DEATH(0.1 SECONDS)
density = TRUE
visible_message("[span_hierophant_warning("[src] fades in!")]")
- SLEEP_CHECK_DEATH(1) //at this point the blasts we made detonate
+ SLEEP_CHECK_DEATH(0.1 SECONDS) //at this point the blasts we made detonate
blinking = FALSE
/mob/living/simple_animal/hostile/megafauna/hierophant/proc/melee_blast(mob/victim) //make a 3x3 blast around a target
@@ -370,7 +370,7 @@ Difficulty: Hard
var/dist = get_dist(original, T)
if(dist > last_dist)
last_dist = dist
- sleep(1 + min(burst_range - last_dist, 12) * spread_speed) //gets faster as it gets further out
+ sleep(0.1 SECONDS + min(burst_range - last_dist, 1.2 SECONDS) * spread_speed) //gets faster as it gets further out
new /obj/effect/temp_visual/hierophant/blast(T, caster, FALSE)
/mob/living/simple_animal/hostile/megafauna/hierophant/proc/burst(turf/original, spread_speed)
@@ -654,10 +654,10 @@ Difficulty: Hard
if(!T)
return
playsound(T,'sound/magic/blind.ogg', 125, 1, -5) //make a sound
- sleep(6) //wait a little
+ sleep(0.6 SECONDS) //wait a little
bursting = TRUE
do_damage(T) //do damage and mark us as bursting
- sleep(1.3) //slightly forgiving; the burst animation is 1.5 deciseconds
+ sleep(0.13 SECONDS) //slightly forgiving; the burst animation is 0.15 seconds
bursting = FALSE //we no longer damage crossers
/obj/effect/temp_visual/hierophant/blast/Crossed(atom/movable/AM)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm
index f354b3cdcb58..7b16900d6ebc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm
@@ -222,7 +222,7 @@
L.adjustBruteLoss(damage * 3) //60 damage plus the normal damage against fauna, total of 80 should make it mega competitive vs other weapons
L.adjustFireLoss(damage)
to_chat(L, span_userdanger("You're hit by [source]'s fire breath!"))
- sleep(1)
+ sleep(0.1 SECONDS)
///drakeling wing flap attack: deals relatively minor damage to lavaland fauna and pushes anything it hits away, also breaks rocks on contact like a plasmacutter
/obj/effect/proc_holder/drakeling/wing_flap
@@ -301,9 +301,9 @@
return
var/mob/living/L = owner
var/turf/landing_turf = get_step(dragon.loc, dragon.dir)
- L.spin(4, 1)
- animate(L, pixel_y = -6, time = 4)
- animate(dragon, pixel_y = -6, time = 3)
+ L.spin(0.4 SECONDS, 0.1 SECONDS)
+ animate(L, pixel_y = -6, time = 0.4 SECONDS)
+ animate(dragon, pixel_y = -6, time = 0.3 SECONDS)
playsound(dragon, 'sound/vehicles/skateboard_ollie.ogg', 50, TRUE)
passtable_on(L, VEHICLE_TRAIT)
passtable_on(dragon, VEHICLE_TRAIT)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
index 1326f2dacbbe..ebbd16777e10 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
@@ -133,7 +133,7 @@
new /obj/effect/temp_visual/hierophant/telegraph(T, src)
new /obj/effect/temp_visual/hierophant/telegraph(source, src)
playsound(source,'sound/machines/airlockopen.ogg', 200, 1)
- addtimer(CALLBACK(src, .proc/pandora_teleport_2, T, source), 2)
+ addtimer(CALLBACK(src, .proc/pandora_teleport_2, T, source), 0.2 SECONDS)
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(var/turf/T, var/turf/source)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
@@ -142,14 +142,14 @@
new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
for(var/t in RANGE_TURFS(1, source))
new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
- animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
+ animate(src, alpha = 0, time = 0.2 SECONDS, easing = EASE_OUT) //fade out
visible_message("[span_hierophant_warning("[src] fades out!")]")
density = FALSE
- addtimer(CALLBACK(src, .proc/pandora_teleport_3, T), 2)
+ addtimer(CALLBACK(src, .proc/pandora_teleport_3, T), 0.2 SECONDS)
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_3(var/turf/T)
forceMove(T)
- animate(src, alpha = 255, time = 2, easing = EASE_IN) //fade IN
+ animate(src, alpha = 255, time = 0.2 SECONDS, easing = EASE_IN) //fade IN
density = TRUE
visible_message("[span_hierophant_warning("[src] fades in!")]")
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 4617e4277d2a..fe1dd6a4d5ab 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -466,7 +466,7 @@
resize = RESIZE_DEFAULT_SIZE
if(changed)
- animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
+ animate(src, transform = ntransform, time = 0.2 SECONDS, easing = EASE_IN|EASE_OUT)
/mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
toggle_ai(AI_OFF) // To prevent any weirdness.
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index f6b309564d32..9227bfa32e0c 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -103,9 +103,9 @@
var/sleeptime = movement_delay()
if(sleeptime <= 0)
- sleeptime = 1
+ sleeptime = 0.1 SECONDS
- sleep(sleeptime + 2) // this is about as fast as a player slime can go
+ sleep(sleeptime + 0.2 SECONDS) // this is about as fast as a player slime can go
AIproc = 0
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index db24e66c30d5..98a960068875 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -488,7 +488,7 @@
mobility_flags &= ~MOBILITY_MOVE
if(user)
step_away(src,user,15)
- sleep(3)
+ sleep(0.3 SECONDS)
if(user)
step_away(src,user,15)
update_mobility()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 272ae1681937..19d17bc36f27 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -538,7 +538,7 @@
var/turf/our_tile = get_turf(src)
var/obj/visual = new /obj/effect/temp_visual/point(our_tile, invisibility)
- animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + A.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + A.pixel_y, time = 1.7, easing = EASE_OUT)
+ animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + A.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + A.pixel_y, time = 0.17 SECONDS, easing = EASE_OUT)
return TRUE
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 8e9284880d8b..a62719306970 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -245,10 +245,10 @@
for(var/i in 0 to duration-1)
if (i == 0)
- animate(C, pixel_x=rand(min,max), pixel_y=rand(min,max), time=1)
+ animate(C, pixel_x=rand(min,max), pixel_y=rand(min,max), time=0.1 SECONDS)
else
- animate(pixel_x=rand(min,max), pixel_y=rand(min,max), time=1)
- animate(pixel_x=oldx, pixel_y=oldy, time=1)
+ animate(pixel_x=rand(min,max), pixel_y=rand(min,max), time=0.1 SECONDS)
+ animate(pixel_x=oldx, pixel_y=oldy, time=0.1 SECONDS)
///Find if the message has the real name of any user mob in the mob_list
diff --git a/code/modules/modular_computers/file_system/programs/arcade.dm b/code/modules/modular_computers/file_system/programs/arcade.dm
index 6161e4127df0..3f2fd4639e87 100644
--- a/code/modules/modular_computers/file_system/programs/arcade.dm
+++ b/code/modules/modular_computers/file_system/programs/arcade.dm
@@ -21,7 +21,7 @@
var/boss_id = 1
/datum/computer_file/program/arcade/proc/game_check(mob/user)
- sleep(5)
+ sleep(0.5 SECONDS)
if(boss_hp <= 0)
heads_up = "You have crushed [boss_name]! Rejoice!"
playsound(computer.loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 10)
@@ -30,7 +30,7 @@
if(istype(computer))
computer.update_icon()
ticket_count += 1
- sleep(10)
+ sleep(1 SECONDS)
return
else if(player_hp <= 0 || player_mp <= 0)
heads_up = "You have been defeated... how will the station survive?"
@@ -39,7 +39,7 @@
program_icon_state = "arcade_off"
if(istype(computer))
computer.update_icon()
- sleep(10)
+ sleep(1 SECONDS)
return
return
@@ -106,7 +106,7 @@
computer.play_interact_sound()
playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10)
boss_hp -= attackamt
- sleep(10)
+ sleep(1 SECONDS)
game_check()
enemy_check()
return TRUE
@@ -122,7 +122,7 @@
playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10)
player_hp += healamt
player_mp -= healcost
- sleep(10)
+ sleep(1 SECONDS)
game_check()
enemy_check()
return TRUE
@@ -135,7 +135,7 @@
computer.play_interact_sound()
playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3, falloff = 10)
player_mp += rechargeamt
- sleep(10)
+ sleep(1 SECONDS)
game_check()
enemy_check()
return TRUE
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
index 36716fcaee30..cd0d49599ed7 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
@@ -18,7 +18,7 @@ Contents:
to_chat(U, span_warning("You don't have enough power to enable Stealth!"))
return
stealth = !stealth
- animate(U, alpha = 20,time = 15)
+ animate(U, alpha = 20,time = 1.5 SECONDS)
U.visible_message(span_warning("[U.name] vanishes into thin air!"), \
span_notice("You are now mostly invisible to normal detection."))
@@ -29,7 +29,7 @@ Contents:
return 0
if(stealth)
stealth = !stealth
- animate(U, alpha = 255, time = 15)
+ animate(U, alpha = 255, time = 1.5 SECONDS)
U.visible_message(span_warning("[U.name] appears from thin air!"), \
span_notice("You are now visible."))
return 1
diff --git a/code/modules/ninja/suit/suit_process.dm b/code/modules/ninja/suit/suit_process.dm
index 4a89a59f754e..26d4324b5248 100644
--- a/code/modules/ninja/suit/suit_process.dm
+++ b/code/modules/ninja/suit/suit_process.dm
@@ -17,4 +17,4 @@
cell.charge = 0
cancel_stealth()
- sleep(10)//Checks every second.
+ sleep(1 SECONDS)//Checks every second.
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 9ef9cf6cd347..69b19b8c4cfe 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -127,7 +127,7 @@ GLOBAL_LIST_EMPTY(adminfaxes)
playsound(loc, "sound/items/polaroid1.ogg", 50, 1)
// give the sprite some time to flick
- sleep(23)
+ sleep(2.3 SECONDS)
if (istype(incoming, /obj/item/paper))
copy(incoming)
@@ -172,7 +172,7 @@ GLOBAL_LIST_EMPTY(adminfaxes)
if ("Central Command")
send_adminmessage(sender, "CENTCOM FAX", rcvdcopy, "CentcomFaxReply", "#006100")
sendcooldown = world.time + 1 MINUTES
- sleep(50)
+ sleep(5 SECONDS)
visible_message("[src] beeps, \"Message transmitted successfully.\"")
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index c236f92b80ed..be52ec18ecd6 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -100,11 +100,11 @@
opentrim.color = cab.colour
var/overlays = list(opentrim, open)
add_overlay(overlays)
- sleep(5)
+ sleep(0.5 SECONDS)
cut_overlay(overlays)
else
icon_state = "[initial(icon_state)]-open"
- sleep(5)
+ sleep(0.5 SECONDS)
icon_state = initial(icon_state)
updateUsrDialog()
else if(P.tool_behaviour == TOOL_WRENCH)
@@ -166,11 +166,11 @@
opentrim.color = cab.colour
var/overlays = list(opentrim, open)
add_overlay(overlays)
- sleep(5)
+ sleep(0.5 SECONDS)
cut_overlay(overlays)
else
icon_state = "[initial(icon_state)]-open"
- sleep(5)
+ sleep(0.5 SECONDS)
icon_state = initial(icon_state)
/obj/structure/filingcabinet/colored/attackby(obj/item/P, mob/user, params)
@@ -306,7 +306,7 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
fillCurrent()
virgin = 0
cooldown = 1
- sleep(100) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
+ sleep(10 SECONDS) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
cooldown = 0
else
to_chat(user, span_warning("[src] is jammed, give it a few seconds."))
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index de92d631b2c0..5b1998dda7fa 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -49,7 +49,7 @@
user.adjust_blurriness(6)
if(eyes)
eyes.applyOrganDamage(rand(6,8))
- sleep(10)
+ sleep(1 SECONDS)
return (BRUTELOSS)
/obj/item/paperplane/update_icon()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index d33664568ea1..967e839599d3 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -66,7 +66,7 @@
if(toner > 0 && !busy && copy)
copy(copy)
busy = TRUE
- sleep(15)
+ sleep(1.5 SECONDS)
busy = FALSE
else
break
@@ -76,7 +76,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)
+ sleep(1.5 SECONDS)
busy = FALSE
else
break
@@ -86,7 +86,7 @@
new /obj/item/documents/photocopy(loc, doccopy)
toner-= 6 // the sprite shows 6 papers, yes I checked
busy = TRUE
- sleep(15)
+ sleep(1.5 SECONDS)
busy = FALSE
else
break
@@ -109,7 +109,7 @@
else
break
busy = TRUE
- sleep(15)
+ sleep(1.5 SECONDS)
var/obj/item/photo/p = new /obj/item/photo (loc)
var/datum/picture/toEmbed = new(name = "[ass]'s Ass", desc = "You see [ass]'s ass on the photo.", image = temp_img)
p.pixel_x = rand(-10, 10)
@@ -157,7 +157,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)
+ sleep(1.5 SECONDS)
busy = FALSE
updateUsrDialog()
else if(href_list["colortoggle"])
diff --git a/code/modules/pool/components/swimming.dm b/code/modules/pool/components/swimming.dm
index 7c1387b8073e..f657a37fbbd8 100644
--- a/code/modules/pool/components/swimming.dm
+++ b/code/modules/pool/components/swimming.dm
@@ -78,11 +78,11 @@
var/obj/item/twohanded/required/pool/helditem = L.get_active_held_item()
if(istype(helditem) && helditem.wielded)
bob_tick ++
- animate(L, time=9.5, pixel_y = (L.pixel_y == bob_height_max) ? bob_height_min : bob_height_max)
+ animate(L, time=0.95 SECONDS, pixel_y = (L.pixel_y == bob_height_max) ? bob_height_min : bob_height_max)
floating = TRUE
else
if(bob_tick)
- animate(L, time=5, pixel_y = 0)
+ animate(L, time=0.5 SECONDS, pixel_y = 0)
bob_tick = 0
if(!floating && is_drowning(L))
if(!drowning)
diff --git a/code/modules/pool/components/swimming_dissolve.dm b/code/modules/pool/components/swimming_dissolve.dm
index e92f1009afce..5a97d30629b1 100644
--- a/code/modules/pool/components/swimming_dissolve.dm
+++ b/code/modules/pool/components/swimming_dissolve.dm
@@ -25,4 +25,4 @@
qdel(L)
/datum/component/swimming/dissolve/exit_pool()
- animate(parent, alpha=start_alpha, time=20)
+ animate(parent, alpha=start_alpha, time=2 SECONDS)
diff --git a/code/modules/pool/pool_items.dm b/code/modules/pool/pool_items.dm
index b54f5072cccd..a5546069a49e 100644
--- a/code/modules/pool/pool_items.dm
+++ b/code/modules/pool/pool_items.dm
@@ -58,20 +58,20 @@
var/mob/living/L = user
if(istype(L))
L.Immobilize(63)
- animate(user, time=20, pixel_y=18)
- sleep(20)
- animate(user, time=10, pixel_y=12)
- sleep(10)
+ animate(user, time=2 SECONDS, pixel_y=18)
+ sleep(2 SECONDS)
+ animate(user, time=1 SECONDS, pixel_y=12)
+ sleep(1 SECONDS)
user.visible_message("[user] keeps swimming higher and higher!")
- animate(user, time=10, pixel_y=22)
- sleep(10)
- animate(user, time=10, pixel_y=16)
- sleep(10)
- animate(user, time=15, pixel_y=32)
- sleep(15)
+ animate(user, time=1 SECONDS, pixel_y=22)
+ sleep(1 SECONDS)
+ animate(user, time=1 SECONDS, pixel_y=16)
+ sleep(1 SECONDS)
+ animate(user, time=1.5 SECONDS, pixel_y=32)
+ sleep(1.5 SECONDS)
user.visible_message("[user] suddenly realised they aren't in the water and cannot float.")
- animate(user, time=1, pixel_y=0)
- sleep(1)
+ animate(user, time=0.1 SECONDS, pixel_y=0)
+ sleep(0.1 SECONDS)
user.ghostize()
user.gib()
suiciding = FALSE
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index ff54764d4373..c47492a0409a 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -626,7 +626,7 @@
break
on = !on
update(0)
- sleep(rand(5, 15))
+ sleep(rand(0.5, 1.5) SECONDS)
on = (status == LIGHT_OK) && !forced_off
update(0)
flickering = 0
@@ -772,9 +772,9 @@
set waitfor = 0
var/turf/T = get_turf(src.loc)
break_light_tube() // break it first to give a warning
- sleep(2)
+ sleep(0.2 SECONDS)
explosion(T, 0, 1, 2, 4)
- sleep(1)
+ sleep(0.1 SECONDS)
qdel(src)
// the light item
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 0323041c26e1..d9e087c18724 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -180,7 +180,7 @@ field_generator power level display
spawn(1)
cleanup()
while (warming_up>0 && !active)
- sleep(50)
+ sleep(5 SECONDS)
warming_up--
update_icon()
@@ -188,7 +188,7 @@ field_generator power level display
active = FG_CHARGING
spawn(1)
while (warming_up<3 && active)
- sleep(50)
+ sleep(5 SECONDS)
warming_up++
update_icon()
if(warming_up >= 3)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 73d1165c3a8a..1238d1b7c086 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -76,20 +76,20 @@
INVOKE_ASYNC(src, .proc/begin_the_end)
/obj/singularity/narsie/large/cult/proc/begin_the_end()
- to_chat(world, "
The round has ended.")
- sleep(50)
- priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 60 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg')
- sleep(500)
- priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: ONE MINUTE. ","Central Command Higher Dimensional Affairs")
- sleep(50)
+ ending_helper()
+ sleep(5 SECONDS)
+ priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 30 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg')
+ sleep(30 SECONDS)
+ priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: 30 SECONDS. ","Central Command Higher Dimensional Affairs")
+ sleep(5 SECONDS)
set_security_level("delta")
SSshuttle.registerHostileEnvironment(src)
SSshuttle.lockdown = TRUE
- sleep(600)
+ sleep(25 SECONDS)
if(resolved == FALSE)
resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')
- addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 120)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 12 SECONDS)
/obj/singularity/narsie/large/cult/Destroy()
GLOB.cult_narsie = null
@@ -100,9 +100,9 @@
/proc/cult_ending_helper(var/no_explosion = 0)
if(no_explosion)
- Cinematic(CINEMATIC_CULT,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))
+ Cinematic(CINEMATIC_CULT,world)
else
- Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))
+ Cinematic(CINEMATIC_CULT_NUKE,world)
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
@@ -138,7 +138,7 @@
if(M.stat == CONSCIOUS)
if(!iscultist(M))
to_chat(M, span_cultsmall("You feel conscious thought crumble away in an instant as you gaze upon [src.name]..."))
- M.apply_effect(60, EFFECT_STUN)
+ M.apply_effect(6 SECONDS, EFFECT_STUN)
/obj/singularity/narsie/consume(atom/A)
@@ -220,7 +220,7 @@
setDir(SOUTH)
move_self = 0
flick("narsie_spawn_anim",src)
- sleep(11)
+ sleep(1.1 SECONDS)
move_self = 1
icon = initial(icon)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 2c8c2efdf734..5b969aac6472 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -100,7 +100,7 @@
for(var/i in 1 to 3)
C.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
new /obj/effect/gibspawner/generic(T, C)
- sleep(1)
+ sleep(0.1 SECONDS)
C.ghostize()
var/obj/item/bodypart/head/rip_u = C.get_bodypart(BODY_ZONE_HEAD)
rip_u.dismember(BURN) //nice try jedi
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 468d621ddd6d..d8e2228bf882 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -309,7 +309,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
final_countdown = FALSE
return
else if((i % 50) != 0 && i > 50) // A message once every 5 seconds until the final 5 seconds which count down individualy
- sleep(10)
+ sleep(1 SECONDS)
continue
else if(i > 50)
if(corruptor_attached)
@@ -333,7 +333,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
log_game("The supermatter crystal: [i*0.1]...") // yogs start - Logs SM chatter
investigate_log("The supermatter crystal: [i*0.1]...", INVESTIGATE_SUPERMATTER) // yogs end
radio.talk_into(src, speaking, common_channel)
- sleep(10)
+ sleep(1 SECONDS)
explode()
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 5062d3e26a37..fe1dd8c3a1f6 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -516,7 +516,7 @@
var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
user.visible_message(span_suicide("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!"))
- sleep(25)
+ sleep(2.5 SECONDS)
if(user.is_holding(src))
var/turf/T = get_turf(user)
process_fire(user, user, FALSE, null, BODY_ZONE_HEAD)
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 5202b4a6462f..4b22407629d4 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -78,22 +78,22 @@
if(can_shoot())
user.notransform = TRUE
playsound(src, 'sound/vehicles/rocketlaunch.ogg', 80, 1, 5)
- animate(user, pixel_z = 300, time = 30, easing = LINEAR_EASING)
- sleep(70)
- animate(user, pixel_z = 0, time = 5, easing = LINEAR_EASING)
- sleep(5)
+ animate(user, pixel_z = 300, time = 3 SECONDS, easing = LINEAR_EASING)
+ sleep(7 SECONDS)
+ animate(user, pixel_z = 0, time = 0.5 SECONDS, easing = LINEAR_EASING)
+ sleep(0.5 SECONDS)
user.notransform = FALSE
process_fire(user, user, TRUE)
if(!QDELETED(user)) //if they weren't gibbed by the explosion, take care of them for good.
user.gib()
return MANUAL_SUICIDE
else
- sleep(5)
+ sleep(0.5 SECONDS)
shoot_with_empty_chamber(user)
- sleep(20)
+ sleep(2 SECONDS)
user.visible_message(span_warning("[user] looks about the room realizing [user.p_theyre()] still there. [user.p_they(TRUE)] proceed to shove [src] down their throat and choke [user.p_them()]self with it!"), \
span_userdanger("You look around after realizing you're still here, then proceed to choke yourself to death with [src]!"))
- sleep(20)
+ sleep(2 SECONDS)
return OXYLOSS
/obj/item/gun/ballistic/handcannon
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index ada1608f18ca..cca5cfaba181 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -170,7 +170,7 @@
/obj/item/gun/energy/suicide_act(mob/living/user)
if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD))
user.visible_message(span_suicide("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!"))
- sleep(25)
+ sleep(2.5 SECONDS)
if(user.is_holding(src))
user.visible_message(span_suicide("[user] melts [user.p_their()] face off with [src]!"))
playsound(loc, fire_sound, 50, 1, -1)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index c7f7398dd2a6..1590376f3916 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -530,7 +530,7 @@
if(!hitscanning && !forcemoved)
pixel_x = trajectory.return_px() - trajectory.mpx * trajectory_multiplier * SSprojectiles.global_iterations_per_move
pixel_y = trajectory.return_py() - trajectory.mpy * trajectory_multiplier * SSprojectiles.global_iterations_per_move
- animate(src, pixel_x = trajectory.return_px(), pixel_y = trajectory.return_py(), time = 1, flags = ANIMATION_END_NOW)
+ animate(src, pixel_x = trajectory.return_px(), pixel_y = trajectory.return_py(), time = 0.1 SECONDS, flags = ANIMATION_END_NOW)
Range()
/obj/item/projectile/proc/process_homing() //may need speeding up in the future performance wise.
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index c58511412229..ecad236dcc90 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -461,8 +461,8 @@
unmagify()
/obj/structure/closet/decay/proc/decay()
- animate(src, alpha = 0, time = 30)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 30)
+ animate(src, alpha = 0, time = 3 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 3 SECONDS)
/obj/structure/closet/decay/open(mob/living/user)
. = ..()
@@ -903,7 +903,7 @@
var/reresize = pick(newsize1, newsize2, newsize3, newsize4, newsize5)
X.resize = reresize
X.update_transform()
- sleep(100)
+ sleep(10 SECONDS)
if(reresize == 0.5)
reresize = 2
X.resize = reresize
diff --git a/code/modules/projectiles/projectile/special/curse.dm b/code/modules/projectiles/projectile/special/curse.dm
index 0b305f3d8745..78706b32131c 100644
--- a/code/modules/projectiles/projectile/special/curse.dm
+++ b/code/modules/projectiles/projectile/special/curse.dm
@@ -47,7 +47,7 @@
var/datum/beam/D = starting.Beam(T, icon_state = "curse[handedness]", time = 32, maxdistance = INFINITY, beam_type=/obj/effect/ebeam/curse_arm, beam_sleep_time = 1)
for(var/b in D.elements)
var/obj/effect/ebeam/B = b
- animate(B, alpha = 0, time = 32)
+ animate(B, alpha = 0, time = 3.2 SECONDS)
return ..()
/obj/item/projectile/curse_hand/progenitor
diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm
index d59ba6ca0f21..35bb0af84883 100644
--- a/code/modules/projectiles/projectile/special/hallucination.dm
+++ b/code/modules/projectiles/projectile/special/hallucination.dm
@@ -99,8 +99,8 @@
target_pixel_y = -16
layer = ABOVE_MOB_LAYER
hal_target.client.images += blood
- animate(blood, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = 5)
- addtimer(CALLBACK(src, .proc/cleanup_blood), 5)
+ animate(blood, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = 0.5 SECONDS)
+ addtimer(CALLBACK(src, .proc/cleanup_blood), 0.5 SECONDS)
/obj/item/projectile/hallucination/proc/cleanup_blood(image/blood)
hal_target.client.images -= blood
@@ -131,8 +131,8 @@
hal_hitsound_wall = "ricochet"
hal_impact_effect = "impact_bullet"
hal_impact_effect_wall = "impact_bullet"
- hit_duration = 5
- hit_duration_wall = 5
+ hit_duration = 0.5 SECONDS
+ hit_duration_wall = 0.5 SECONDS
/obj/item/projectile/hallucination/bullet/hal_apply_effect()
hal_target.adjustStaminaLoss(60)
@@ -146,8 +146,8 @@
hal_hitsound_wall = 'sound/weapons/effects/searwall.ogg'
hal_impact_effect = "impact_laser"
hal_impact_effect_wall = "impact_laser_wall"
- hit_duration = 4
- hit_duration_wall = 10
+ hit_duration = 0.4 SECONDS
+ hit_duration_wall = 1 SECONDS
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
/obj/item/projectile/hallucination/laser/hal_apply_effect()
@@ -182,7 +182,7 @@
hal_hitsound_wall = 'sound/weapons/effects/searwall.ogg'
hal_impact_effect = "impact_laser_blue"
hal_impact_effect_wall = null
- hit_duration = 4
+ hit_duration = 0.4 SECONDS
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
/obj/item/projectile/hallucination/disabler/hal_apply_effect()
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index ffc1045087ea..437eee8b600d 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -240,7 +240,7 @@
add_overlay("juicer_blend")
var/offset = prob(50) ? -2 : 2
var/old_pixel_x = pixel_x
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = -1) //start shaking
+ animate(src, pixel_x = pixel_x + offset, time = 0.02 SECONDS, loop = -1) //start shaking
addtimer(CALLBACK(src, .proc/stop_shaking, old_pixel_x), duration)
/obj/machinery/reagentgrinder/proc/stop_shaking(old_px)
@@ -265,7 +265,7 @@
power_change()
if(!container || stat & (NOPOWER|BROKEN) || container.reagents.total_volume >= container.reagents.maximum_volume)
return
- operate_for(50, juicing = TRUE)
+ operate_for(5 SECONDS, juicing = TRUE)
for(var/obj/item/i in holdingitems)
if(container.reagents.total_volume >= container.reagents.maximum_volume)
break
@@ -285,7 +285,7 @@
power_change()
if(!container || stat & (NOPOWER|BROKEN) || container.reagents.total_volume >= container.reagents.maximum_volume)
return
- operate_for(60)
+ operate_for(6 SECONDS)
for(var/i in holdingitems)
if(container.reagents.total_volume >= container.reagents.maximum_volume)
break
@@ -314,8 +314,8 @@
power_change()
if(!container || stat & (NOPOWER|BROKEN))
return
- operate_for(50, juicing = TRUE)
- addtimer(CALLBACK(src, /obj/machinery/reagentgrinder/proc/mix_complete), 50)
+ operate_for(5 SECONDS, juicing = TRUE)
+ addtimer(CALLBACK(src, /obj/machinery/reagentgrinder/proc/mix_complete), 5 SECONDS)
/obj/machinery/reagentgrinder/proc/mix_complete()
if(container?.reagents.total_volume)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 75b2c98fbaeb..9e617353f321 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -870,7 +870,7 @@
M.do_jitter_animation(10)
addtimer(CALLBACK(M, /mob/living/carbon.proc/do_jitter_animation, 10), 40) //jitter immediately, then again after 4 and 8 seconds
addtimer(CALLBACK(M, /mob/living/carbon.proc/do_jitter_animation, 10), 80)
- sleep(100) //so the ghost has time to re-enter
+ sleep(10 SECONDS) //so the ghost has time to re-enter
if(iscarbon(M))
var/mob/living/carbon/C = M
for(var/organ in C.internal_organs)
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 626e47a816bc..d3807053a69a 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -749,18 +749,18 @@
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
var/rotation = rand(0, 360)*rand(1, 4) // By this point the player is probably puking and quitting anyway
for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING)
- animate(transform = matrix(-rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING)
- animate(M, transform = matrix(-rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING)
- animate(transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING)
+ animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 0.5 SECONDS, easing = QUAD_EASING)
+ animate(transform = matrix(-rotation, MATRIX_ROTATE), time = 0.5 SECONDS, easing = QUAD_EASING)
+ animate(M, transform = matrix(-rotation, MATRIX_ROTATE), time = 0.5 SECONDS, easing = QUAD_EASING)
+ animate(transform = matrix(rotation, MATRIX_ROTATE), time = 0.5 SECONDS, easing = QUAD_EASING)
return ..()
/datum/reagent/toxin/rotatium/on_mob_end_metabolize(mob/living/M)
if(M && M.hud_used)
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
- animate(M, transform = matrix(), time = 5, easing = QUAD_EASING)
+ animate(whole_screen, transform = matrix(), time = 0.5 SECONDS, easing = QUAD_EASING)
+ animate(M, transform = matrix(), time = 0.5 SECONDS, easing = QUAD_EASING)
..()
/datum/reagent/toxin/anacea
diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm
index 9e9cdfe3cc3b..a86d0bdd68fd 100644
--- a/code/modules/reagents/chemistry/recipes.dm
+++ b/code/modules/reagents/chemistry/recipes.dm
@@ -69,11 +69,11 @@
spawn(0) //so everything moves at the same time.
if(setting_type)
for(var/i = 0, i < moving_power, i++)
- sleep(2)
+ sleep(0.2 SECONDS)
if(!step_away(X, T))
break
else
for(var/i = 0, i < moving_power, i++)
- sleep(2)
+ sleep(0.2 SECONDS)
if(!step_towards(X, T))
break
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index f52cffe751da..06f9225306a9 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -48,7 +48,7 @@
var/makes_me_think = pick(strings(REDPILL_FILE, "redpill_questions"))
if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes
- sleep(50)
+ sleep(5 SECONDS)
to_chat(M, span_notice("[makes_me_think]"))
if(reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 69318f4f4702..f691b80e7352 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -100,7 +100,7 @@
for(var/i=0, iThey have signed the pact!")
to_chat(target, span_userdanger("You sign Lilith's Pact."))
diff --git a/yogstation/code/modules/admin/moja.dm b/yogstation/code/modules/admin/moja.dm
index c31f8d1a3e18..335818b0a0da 100644
--- a/yogstation/code/modules/admin/moja.dm
+++ b/yogstation/code/modules/admin/moja.dm
@@ -24,28 +24,28 @@
if(3)
visible_message(span_userdanger("Sigils form along [src]'s body. \His skin blackens as \he glows a blinding purple."), \
span_velvet("Your body begins to warp. Sigils etch themselves upon your flesh."))
- animate(src, color = list(rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0)), time = 150) //Produces a slow skin-blackening effect
+ animate(src, color = list(rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0)), time = 15 SECONDS) //Produces a slow skin-blackening effect
playsound(src, 'yogstation/sound/magic/divulge_03.ogg', 50, 0)
if(!do_after(src, 15 SECONDS, target = src))
visible_message(span_warning("[src] falls to the ground!"), span_userdanger("Your transformation was interrupted!"))
- animate(src, color = initial(src.color), pixel_y = initial(src.pixel_y), time = 10)
+ animate(src, color = initial(src.color), pixel_y = initial(src.pixel_y), time = 1 SECONDS)
return
playsound(src, 'yogstation/sound/magic/divulge_ending.ogg', 50, 0)
visible_message(span_userdanger("[src] rises into the air, crackling with power!"), "Your mind...! can't--- THINK--")
- animate(src, pixel_y = src.pixel_y + 8, time = 60)
- sleep(45)
- Shake(5, 5, 110)
+ animate(src, pixel_y = src.pixel_y + 8, time = 6 SECONDS)
+ sleep(4.5 SECONDS)
+ Shake(5, 5, 11 SECONDS)
for(var/i in 1 to 20)
to_chat(src, "[pick("I- I- I-", "Mind-", "Sigils-", "Can't think-", "POWER-","TAKE-", "M-M-MOOORE-")]")
- sleep(1.1) //Spooky flavor message spam
+ sleep(0.11 SECONDS) //Spooky flavor message spam
visible_message(span_userdanger("A tremendous shockwave emanates from [src]!"), "YOU ARE FREE!!")
playsound(src, 'yogstation/sound/magic/divulge_end.ogg', 50, 0)
- animate(src, color = initial(color), pixel_y = initial(pixel_y), time = 30)
+ animate(src, color = initial(color), pixel_y = initial(pixel_y), time = 3 SECONDS)
for(var/mob/living/L in view(7, src))
if(L == src)
continue
L.flash_act(1, 1)
- L.Knockdown(50)
+ L.Knockdown(5 SECONDS)
if(istype(src,/mob/living/carbon/human))
var/mob/living/carbon/human/H = src
H.make_moja()
diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm
index 0957553f5fa5..5100cadbb746 100644
--- a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm
+++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm
@@ -245,7 +245,7 @@
psi = min(psi + 1, psi_cap)
total_regen--
update_psi_hud()
- sleep(0.5)
+ sleep(0.05 SECONDS)
psi_used_since_regen = 0
psi_regen_ticks = psi_regen_delay
psi_regenerating = FALSE
diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm
index 94e1761b1373..440749c8018f 100644
--- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm
+++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_divulge.dm
@@ -54,29 +54,29 @@
if(3)
user.visible_message(span_userdanger("Sigils form along [user]'s body. \His skin blackens as \he glows a blinding purple."), \
span_velvet("Your body begins to warp. Sigils etch themselves upon your flesh."))
- animate(user, color = list(rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0)), time = 150) //Produces a slow skin-blackening effect
+ animate(user, color = list(rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0), rgb(0, 0, 0)), time = 15 SECONDS) //Produces a slow skin-blackening effect
playsound(user, 'yogstation/sound/magic/divulge_03.ogg', 50, 0)
if(!do_after(user, 15 SECONDS, target = user))
user.visible_message(span_warning("[user] falls to the ground!"), span_userdanger("Your transformation was interrupted!"))
- animate(user, color = initial(user.color), pixel_y = initial(user.pixel_y), time = 10)
+ animate(user, color = initial(user.color), pixel_y = initial(user.pixel_y), time = 1 SECONDS)
in_use = FALSE
return
playsound(user, 'yogstation/sound/magic/divulge_ending.ogg', 50, 0)
user.visible_message(span_userdanger("[user] rises into the air, crackling with power!"), "Your mind...! can't--- THINK--")
- animate(user, pixel_y = user.pixel_y + 8, time = 60)
- sleep(45)
- user.Shake(5, 5, 110)
+ animate(user, pixel_y = user.pixel_y + 8, time = 6 SECONDS)
+ sleep(4.5 SECONDS)
+ user.Shake(5, 5, 11 SECONDS)
for(var/i in 1 to 20)
to_chat(user, "[pick("I- I- I-", "Mind-", "Sigils-", "Can't think-", "POWER-","TAKE-", "M-M-MOOORE-")]")
- sleep(1.1) //Spooky flavor message spam
+ sleep(0.11 SECONDS) //Spooky flavor message spam
user.visible_message(span_userdanger("A tremendous shockwave emanates from [user]!"), "YOU ARE FREE!!")
playsound(user, 'yogstation/sound/magic/divulge_end.ogg', 50, 0)
- animate(user, color = initial(user.color), pixel_y = initial(user.pixel_y), time = 30)
+ animate(user, color = initial(user.color), pixel_y = initial(user.pixel_y), time = 3 SECONDS)
for(var/mob/living/L in view(7, user))
if(L == user)
continue
L.flash_act(1, 1)
- L.Knockdown(50)
+ L.Knockdown(5 SECONDS)
var/old_name = user.real_name
darkspawn.divulge()
var/processed_message = span_velvet("\[Mindlink\] [old_name] has removed their human disguise and is now [user.real_name].")
diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm
index ce26756637bf..0cd30a7ac09e 100644
--- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm
+++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/_sacrament.dm
@@ -56,10 +56,10 @@
span_velvet("Yes! Yes! You feel the weak mortal shell coming apart!"))
for(var/mob/M in GLOB.player_list)
M.playsound_local(M, 'yogstation/sound/magic/sacrament_02.ogg', 20, FALSE, pressure_affected = FALSE)
- animate(user, transform = matrix() * 2, time = 150)
+ animate(user, transform = matrix() * 2, time = 15 SECONDS)
if(!do_after(user, 15 SECONDS, target = user))
user.visible_message(span_warning("[user] falls to the ground!"), span_userdanger("Your transformation was interrupted!"))
- animate(user, transform = matrix(), pixel_y = initial(user.pixel_y), time = 30)
+ animate(user, transform = matrix(), pixel_y = initial(user.pixel_y), time = 3 SECONDS)
in_use = FALSE
QDEL_NULL(soundloop)
return
@@ -69,11 +69,11 @@
user.visible_message(span_userdanger("[user] rises into the air, crackling with power!"), "AND THE WEAK WILL KNOW FEAR--")
for(var/turf/T in range(7, owner))
if(prob(25))
- addtimer(CALLBACK(src, .proc/unleashed_psi, T), rand(1, 40))
- addtimer(CALLBACK(src, .proc/shatter_lights), 35)
+ addtimer(CALLBACK(src, .proc/unleashed_psi, T), rand(0.1, 4) SECONDS)
+ addtimer(CALLBACK(src, .proc/shatter_lights), 3.5 SECONDS)
QDEL_IN(soundloop, 39)
- animate(user, pixel_y = user.pixel_y + 20, time = 40)
- addtimer(CALLBACK(darkspawn, /datum/antagonist/darkspawn/.proc/sacrament), 40)
+ animate(user, pixel_y = user.pixel_y + 20, time = 4 SECONDS)
+ addtimer(CALLBACK(darkspawn, /datum/antagonist/darkspawn/.proc/sacrament), 4 SECONDS)
/datum/action/innate/darkspawn/sacrament/proc/unleashed_psi(turf/T)
playsound(T, 'yogstation/sound/magic/divulge_end.ogg', 25, FALSE)
diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm
index a8b9338a40bf..f10118ab8c1c 100644
--- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm
+++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_abilities/silver_tongue.dm
@@ -44,7 +44,7 @@
/datum/action/innate/darkspawn/silver_tongue/proc/play_recall_sounds(obj/machinery/C) //neato sound effects
set waitfor = FALSE
for(var/i in 1 to 4)
- sleep(10)
+ sleep(1 SECONDS)
if(!C || C.stat)
return
playsound(C, "terminal_type", 50, TRUE)
@@ -52,7 +52,7 @@
playsound(C, 'sound/machines/terminal_alert.ogg', 50, FALSE)
do_sparks(5, TRUE, get_turf(C))
playsound(C, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
- sleep(5)
+ sleep(0.5 SECONDS)
if(!C || C.stat)
return
playsound(C, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm
index c773aea2e80a..a925e96fa153 100644
--- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm
+++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm
@@ -18,8 +18,8 @@
/obj/item/dark_bead/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
- animate(src, alpha = 50, time = 50)
- QDEL_IN(src, 50)
+ animate(src, alpha = 50, time = 5 SECONDS)
+ QDEL_IN(src, 5 SECONDS)
/obj/item/dark_bead/Destroy(force)
if(isliving(loc) && !eating && !force)
diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm
index cbea003b2a06..04e24016053d 100644
--- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm
+++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/umbral_tendrils.dm
@@ -44,7 +44,7 @@
/obj/item/umbral_tendrils/attack(mob/living/target, mob/living/user, twinned_attack = TRUE)
set waitfor = FALSE
..()
- sleep(1)
+ sleep(0.1 SECONDS)
if(twin && twinned_attack && user.Adjacent(target))
twin.attack(target, user, FALSE)
diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm
index 51df7b5b21aa..0528d020f5aa 100644
--- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm
+++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm
@@ -35,7 +35,7 @@
. = ..()
ADD_TRAIT(src, TRAIT_HOLY, "ohgodohfuck") //sorry no magic
alpha = 0
- animate(src, alpha = 255, time = 10)
+ animate(src, alpha = 255, time = 1 SECONDS)
var/obj/item/radio/headset/silicon/ai/radio = new(src) //so the progenitor can hear people's screams over radio
radio.wires.cut(WIRE_TX) //but not talk over it
diff --git a/yogstation/code/modules/guardian/abilities/major/time.dm b/yogstation/code/modules/guardian/abilities/major/time.dm
index 8a3b091dab37..569fbd76c746 100644
--- a/yogstation/code/modules/guardian/abilities/major/time.dm
+++ b/yogstation/code/modules/guardian/abilities/major/time.dm
@@ -116,8 +116,8 @@
var/i,f
for(i=1, i<=7, ++i)
f = filters[i]
- var/next = rand()*20+10
- animate(f, offset=f:offset, time=0, loop=3, flags=ANIMATION_PARALLEL)
+ var/next = rand()*20+(1 SECONDS)
+ animate(f, offset=f:offset, time=0 SECONDS, loop=3, flags=ANIMATION_PARALLEL)
animate(offset=f:offset-1, time=next)
next_animate = world.time + next
diff --git a/yogstation/code/modules/guardian/abilities/special/pocket.dm b/yogstation/code/modules/guardian/abilities/special/pocket.dm
index f4a92aac025c..5456bcc9cf44 100644
--- a/yogstation/code/modules/guardian/abilities/special/pocket.dm
+++ b/yogstation/code/modules/guardian/abilities/special/pocket.dm
@@ -318,8 +318,8 @@ GLOBAL_LIST_EMPTY(pocket_mirrors)
var/i,f
for (i=1, i<=7, ++i)
f = filters[i]
- var/next = rand()*20+10
- animate(f, offset=f:offset, time=0, loop=3, flags=ANIMATION_PARALLEL)
+ var/next = rand()*20+(1 SECONDS)
+ animate(f, offset=f:offset, time=0 SECONDS, loop=3, flags=ANIMATION_PARALLEL)
animate(offset=f:offset-1, time=next)
next_animate = world.time + next
@@ -461,8 +461,8 @@ GLOBAL_LIST_EMPTY(pocket_mirrors)
var/i,f
for (i=1, i<=7, ++i)
f = filters[i]
- var/next = rand()*20+10
- animate(f, offset=f:offset, time=0, loop=3, flags=ANIMATION_PARALLEL)
+ var/next = rand()*20+(1 SECONDS)
+ animate(f, offset=f:offset, time=0 SECONDS, loop=3, flags=ANIMATION_PARALLEL)
animate(offset=f:offset-1, time=next)
next_animate = world.time + next
diff --git a/yogstation/code/modules/guardian/abilities/special/time.dm b/yogstation/code/modules/guardian/abilities/special/time.dm
index f8a8b08655b9..31a6966e815d 100644
--- a/yogstation/code/modules/guardian/abilities/special/time.dm
+++ b/yogstation/code/modules/guardian/abilities/special/time.dm
@@ -30,4 +30,4 @@
. = ..()
var/matrix/ntransform = matrix(transform)
ntransform.Scale(2)
- animate(src, transform = ntransform, time = 2, easing = EASE_IN|EASE_OUT)
+ animate(src, transform = ntransform, time = 0.2 SECONDS, easing = EASE_IN|EASE_OUT)
diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
index fdafd262d75b..35d11139d56d 100644
--- a/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
+++ b/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
@@ -230,7 +230,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
/mob/living/simple_animal/hostile/floor_cluwne/proc/Reset_View(screens, colour, mob/living/carbon/human/H)
if(screens)
for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
+ animate(whole_screen, transform = matrix(), time = 0.5 SECONDS, easing = QUAD_EASING)
if(colour && H)
H.client.color = colour
@@ -405,7 +405,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
var/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0)
var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)
H.client.color = pure_red
- animate(H.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT)
+ animate(H.client,color = red_splash, time = 1 SECONDS, easing = SINE_EASING|EASE_OUT)
for(var/turf/T in orange(H, 4))
H.add_splatter_floor(T)
if(do_after(src, 5 SECONDS, target = H))
@@ -422,7 +422,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
H.density = initial(H.density)
H.anchored = initial(H.anchored)
H.blur_eyes(10)
- animate(H.client,color = old_color, time = 20)
+ animate(H.client,color = old_color, time = 2 SECONDS)
eating = FALSE
switch_stage = switch_stage * 0.75 //he gets faster after each feast
diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index abba061ed8d7..32b69d39f607 100644
--- a/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/yogstation/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -35,21 +35,21 @@
//Yogs begin - Added health gate and telegraph
else if(prob(20) && health < maxHealth/2)
telegraph()
- COLOSSUS_SLEEP(3)
+ COLOSSUS_SLEEP(0.3 SECONDS)
visible_message(span_colossus("\"Bow.\""))
//Yogs end
- ranged_cooldown = world.time + 30
+ ranged_cooldown = world.time + 3 SECONDS
random_shots()
else
if(prob(70))
//Yogs begin - Colossus changes color immediately before shotgunning.
var/oldcolor = color
- animate(src, color = "#C80000", time = 5)
- COLOSSUS_SLEEP(5)
+ animate(src, color = "#C80000", time = 0.5 SECONDS)
+ COLOSSUS_SLEEP(0.5 SECONDS)
ranged_cooldown = world.time + 20
blast()
- animate(src, color = oldcolor, time = 2)
- COLOSSUS_SLEEP(2)
+ animate(src, color = oldcolor, time = 0.2 SECONDS)
+ COLOSSUS_SLEEP(0.2 SECONDS)
//Yogs end
else
ranged_cooldown = world.time + 40
diff --git a/yogstation/code/modules/power/hugbox.dm b/yogstation/code/modules/power/hugbox.dm
index 1e446573b3a0..c4e2ef4f1b42 100644
--- a/yogstation/code/modules/power/hugbox.dm
+++ b/yogstation/code/modules/power/hugbox.dm
@@ -50,8 +50,8 @@
playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 50, 1)
C.notransform = TRUE
buckle_mob(C, TRUE, TRUE)
- C.Stun(30) //So they can't escape by themselves
- sleep(30) //better beg for help
+ C.Stun(3 SECONDS) //So they can't escape by themselves
+ sleep(3 SECONDS) //better beg for help
crunch(C)
return
to_chat(C, span_notice("You hug [src]."))
@@ -69,18 +69,18 @@
shake_camera(crunched, 3, 1)
crunched.add_splatter_floor(location)
add_avail(power_per_hug*50) //5 MW
- crunched.Stun(20)
- sleep(20)
+ crunched.Stun(2 SECONDS)
+ sleep(2 SECONDS)
else
crunched.visible_message(span_danger("[src] hugs [crunched] tighter!"), span_userdanger("[src] starts hugging you tighter!"))
- crunched.Stun(30)
+ crunched.Stun(3 SECONDS)
crunched.adjustBruteLoss(5)
- sleep(30)
+ sleep(3 SECONDS)
if(crunched.buckled) //Are they still buckled?
crunched.visible_message(span_danger("[src] hugs [crunched] tighter!"), span_userdanger("WAY TOO TIGHT."))
- crunched.Stun(40)
+ crunched.Stun(4 SECONDS)
crunched.adjustBruteLoss(5)
- sleep(40)
+ sleep(4 SECONDS)
if(crunched.buckled)
crunched.visible_message(span_danger("You hear a loud crunch coming from [crunched]!"), span_colossus("CRUNCH"))
crunched.add_splatter_floor(location)
@@ -90,9 +90,9 @@
shake_camera(crunched, 3, 1)
playsound(src, "sound/magic/demon_consume.ogg", 60, 1)
crunched.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic, TRAUMA_RESILIENCE_SURGERY)
- sleep(30)
+ sleep(3 SECONDS)
unbuckle_mob(crunched, TRUE)
crunched.notransform = FALSE
- crunched.Knockdown(40)
+ crunched.Knockdown(4 SECONDS)
crunched.visible_message(span_warning("[src] lets go of [crunched]."), span_warning("[src] lets you go."))
diff --git a/yogstation/code/modules/power/validhunter.dm b/yogstation/code/modules/power/validhunter.dm
index cad40017cfed..03e4830cad6d 100644
--- a/yogstation/code/modules/power/validhunter.dm
+++ b/yogstation/code/modules/power/validhunter.dm
@@ -81,7 +81,7 @@
visible_message(span_italics("You hear a loud squelchy grinding sound."))
playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
var/offset = prob(50) ? -2 : 2
- animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
+ animate(src, pixel_x = pixel_x + offset, time = 0.02 SECONDS, loop = 200) //start shaking
var/do_gib = FALSE
var/emagged = obj_flags & EMAGGED
diff --git a/yogstation/code/modules/scripting/Interpreter/Interpreter.dm b/yogstation/code/modules/scripting/Interpreter/Interpreter.dm
index 59565469f222..78d35f271128 100644
--- a/yogstation/code/modules/scripting/Interpreter/Interpreter.dm
+++ b/yogstation/code/modules/scripting/Interpreter/Interpreter.dm
@@ -129,7 +129,7 @@
if(cur_statements < MAX_STATEMENTS)
for(var/node/S in Block.statements)
- while(paused) sleep(10)
+ while(paused) sleep(1 SECONDS)
cur_statements++
if(cur_statements >= MAX_STATEMENTS)
diff --git a/yogstation/code/modules/spacepods/equipment.dm b/yogstation/code/modules/spacepods/equipment.dm
index c50483fb6cd0..c42b687c2d6e 100644
--- a/yogstation/code/modules/spacepods/equipment.dm
+++ b/yogstation/code/modules/spacepods/equipment.dm
@@ -58,7 +58,7 @@
for(var/I in 1 to shots_per)
spacepod.fire_projectiles(projectile_type, target)
playsound(src, fire_sound, 50, TRUE)
- sleep(2)
+ sleep(0.2 SECONDS)
/*
///////////////////////////////////////
diff --git a/yogstation/code/modules/spacepods/physics.dm b/yogstation/code/modules/spacepods/physics.dm
index e73bc6e5b706..8dea1a5724e0 100644
--- a/yogstation/code/modules/spacepods/physics.dm
+++ b/yogstation/code/modules/spacepods/physics.dm
@@ -1,5 +1,5 @@
/obj/spacepod/process(time)
- time /= 10 // fuck off with your deciseconds
+ time /= 10 // fuck off with your deciseconds // uh oh
if(world.time > last_slowprocess + 15)
last_slowprocess = world.time
@@ -199,14 +199,14 @@
transform = mat_from
pixel_x = last_offset_x*32
pixel_y = last_offset_y*32
- animate(src, transform=mat_to, pixel_x = offset_x*32, pixel_y = offset_y*32, time = time*10, flags=ANIMATION_END_NOW)
+ animate(src, transform=mat_to, pixel_x = offset_x*32, pixel_y = offset_y*32, time = time SECONDS, flags=ANIMATION_END_NOW)
for(var/mob/living/M in contents)
var/client/C = M.client
if(!C)
continue
C.pixel_x = last_offset_x*32
C.pixel_y = last_offset_y*32
- animate(C, pixel_x = offset_x*32, pixel_y = offset_y*32, time = time*10, flags=ANIMATION_END_NOW)
+ animate(C, pixel_x = offset_x*32, pixel_y = offset_y*32, time = time SECONDS, flags=ANIMATION_END_NOW)
user_thrust_dir = 0
update_icon()
diff --git a/yogstation/code/modules/spells/cauterize.dm b/yogstation/code/modules/spells/cauterize.dm
index 7cdfe20e87d2..af0f87cd0707 100644
--- a/yogstation/code/modules/spells/cauterize.dm
+++ b/yogstation/code/modules/spells/cauterize.dm
@@ -26,7 +26,7 @@
if(total_dam>=100)
to_chat(target, span_warning("You really feel like you should heal your burns!"))
for(var/i in 1 to real_duration)
- sleep(10)
+ sleep(1 SECONDS)
target.adjustFireLoss(damage_per_tick)
/datum/spellbook_entry/cauterize
diff --git a/yogstation/code/modules/xenoarch/loot/guns.dm b/yogstation/code/modules/xenoarch/loot/guns.dm
index 2dfea53e137e..a7caa08426ad 100644
--- a/yogstation/code/modules/xenoarch/loot/guns.dm
+++ b/yogstation/code/modules/xenoarch/loot/guns.dm
@@ -42,7 +42,7 @@
if(chargesound != oldsound)
playsound(src, chargesound, 100)
- sleep(1)
+ sleep(0.1 SECONDS)
playsound(src, chargesound, 75)
return
@@ -112,7 +112,7 @@
var/image/impact = image('yogstation/icons/obj/xenoarch/guns.dmi',T,"spur_range")
impact.layer = ABOVE_MOB_LAYER
T.overlays += impact
- sleep(3)
+ sleep(0.3 SECONDS)
T.overlays -= impact
qdel(impact)
..()