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

* Swaps sleep() to use SECONDS define

* merge conflicts and skyrat modules

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-10-20 01:43:24 +02:00
committed by GitHub
parent 59dc5c36b7
commit 612568daa0
99 changed files with 280 additions and 279 deletions
+2 -1
View File
@@ -115,6 +115,7 @@
stoplag() // sleep a byond tick
GLOB.stickbanadminexemptiontimerid = addtimer(CALLBACK(GLOBAL_PROC, /proc/restore_stickybans), 5 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE)
return
var/list/ban = ..() //default pager ban stuff
if (ban)
@@ -184,7 +185,7 @@
//do not convert to timer.
spawn (5)
world.SetConfig("ban", bannedckey, null)
sleep(1)
sleep(1 TICKS)
world.SetConfig("ban", bannedckey, null)
if (!ban["fromdb"])
cachedban = cachedban.Copy() //so old references to the list still see the ban as reverting
+4 -4
View File
@@ -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)
+5 -5
View File
@@ -628,7 +628,7 @@
L.dropItemToGround(I, TRUE)
L.Unconscious(100)
sleep(5)
sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdome1))
addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS)
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 1)")
@@ -654,7 +654,7 @@
L.dropItemToGround(I, TRUE)
L.Unconscious(100)
sleep(5)
sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdome2))
addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS)
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 2)")
@@ -677,7 +677,7 @@
var/mob/living/L = M
L.Unconscious(100)
sleep(5)
sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdomeadmin))
addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS)
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Admin.)")
@@ -708,7 +708,7 @@
observer.equip_to_slot_or_del(new /obj/item/clothing/neck/tie/black/tied(observer), ITEM_SLOT_NECK)
observer.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/black(observer), ITEM_SLOT_FEET)
L.Unconscious(100)
sleep(5)
sleep(0.5 SECONDS)
L.forceMove(pick(GLOB.tdomeobserve))
addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS)
log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Observer.)")
@@ -810,7 +810,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"])
+2 -2
View File
@@ -592,10 +592,10 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller)
set waitfor = FALSE
if (playlightning)
sound_to_playing_players('sound/magic/lightning_chargeup.ogg')
sleep(80)
sleep(8 SECONDS)
priority_announce(replacetext(announcement, "%STATION%", station_name()))
if (playlightning)
sleep(20)
sleep(2 SECONDS)
sound_to_playing_players('sound/magic/lightningbolt.ogg')
/// Spawns a portal storm that spawns in sentient/non sentient mobs
@@ -81,7 +81,7 @@
if(!islist)
for(var/V in D.vars)
names += V
sleep(1)
sleep(1 TICKS)
var/list/variable_html = list()
if(islist)