cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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-19 19:43:24 -04:00
committed by GitHub
co-authored by san7890 tastyfish
parent 59dc5c36b7
commit 612568daa0
99 changed files with 280 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/topic.dm
+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"])