cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +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-20 01:43:24 +02:00
committed by GitHub
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/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
+11 -11
View File
@@ -107,11 +107,11 @@
if(open)
new /obj/effect/temp_visual/necropolis(T)
visible_message(span_boldwarning("The door slams closed!"))
sleep(1)
sleep(0.1 SECONDS)
playsound(T, 'sound/effects/stonedoor_openclose.ogg', 300, TRUE, frequency = 80000)
sleep(1)
sleep(0.1 SECONDS)
set_density(TRUE)
sleep(1)
sleep(0.1 SECONDS)
var/turf/sight_blocker_turf = get_turf(src)
if(sight_blocker_distance)
for(var/i in 1 to sight_blocker_distance)
@@ -121,21 +121,21 @@
if(sight_blocker_turf)
sight_blocker.pixel_y = initial(sight_blocker.pixel_y) - (32 * sight_blocker_distance)
sight_blocker.forceMove(sight_blocker_turf)
sleep(2.5)
sleep(0.25 SECONDS)
playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 30, TRUE, frequency = 15000)
add_overlay(door_overlay)
open = FALSE
else
cut_overlay(door_overlay)
new /obj/effect/temp_visual/necropolis/open(T)
sleep(2)
sleep(0.2 SECONDS)
visible_message(span_warning("The door starts to grind open..."))
playsound(T, 'sound/effects/stonedoor_openclose.ogg', 300, TRUE, frequency = 20000)
sleep(22)
sleep(2.2 SECONDS)
sight_blocker.forceMove(src)
sleep(5)
sleep(0.5 SECONDS)
set_density(FALSE)
sleep(5)
sleep(0.5 SECONDS)
open = TRUE
changing_openness = FALSE
return TRUE
@@ -165,7 +165,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
return
user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]..."))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE)
sleep(50)
sleep(5 SECONDS)
return ..()
/obj/structure/necropolis_gate/legion_gate/toggle_the_gate(mob/user, legion_damaged)
@@ -283,7 +283,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
var/break_that_sucker = fall_on_cross == DESTROY_ON_CROSS
playsound(src, 'sound/effects/pressureplate.ogg', 50, TRUE)
Shake(-1, -1, 25)
sleep(5)
sleep(0.5 SECONDS)
if(break_that_sucker)
playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE)
else
@@ -299,7 +299,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
pixel_x = initial(pixel_x)
pixel_y = initial(pixel_y) - 5
animate(src, alpha = initial(alpha), pixel_x = initial(pixel_x), pixel_y = initial(pixel_y), time = 30)
sleep(30)
sleep(3 SECONDS)
falling = FALSE
fallen = FALSE