Merge branch 'master' into upstream-merge-27160
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/obj/effect/overlay/temp/ripple
|
||||
/obj/effect/temp_visual/ripple
|
||||
name = "hyperspace ripple"
|
||||
desc = "Something is coming through hyperspace, you can see the \
|
||||
visual disturbances. It's probably best not to be on top of these \
|
||||
@@ -13,10 +13,10 @@
|
||||
|
||||
duration = 3 * SHUTTLE_RIPPLE_TIME
|
||||
|
||||
/obj/effect/overlay/temp/ripple/Initialize(mapload, time_left)
|
||||
/obj/effect/temp_visual/ripple/Initialize(mapload, time_left)
|
||||
. = ..()
|
||||
animate(src, alpha=255, time=time_left)
|
||||
addtimer(CALLBACK(src, .proc/stop_animation), 8, TIMER_CLIENT_TIME)
|
||||
|
||||
/obj/effect/overlay/temp/ripple/proc/stop_animation()
|
||||
/obj/effect/temp_visual/ripple/proc/stop_animation()
|
||||
icon_state = "medi_holo_no_anim"
|
||||
|
||||
@@ -404,7 +404,7 @@
|
||||
/obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1, animate_time)
|
||||
var/list/turfs = ripple_area(S1)
|
||||
for(var/t in turfs)
|
||||
ripples += new /obj/effect/overlay/temp/ripple(t, animate_time)
|
||||
ripples += new /obj/effect/temp_visual/ripple(t, animate_time)
|
||||
|
||||
/obj/docking_port/mobile/proc/remove_ripples()
|
||||
for(var/R in ripples)
|
||||
@@ -764,6 +764,6 @@
|
||||
if(T in block(T0,T1))
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
|
||||
|
||||
#undef DOCKING_PORT_HIGHLIGHT
|
||||
|
||||
Reference in New Issue
Block a user