Merge pull request #38527 from AutomaticFrenzy/patch/ripples

Fix ripples appearing too broadly and disappearing too soon
This commit is contained in:
Jordan Brown
2018-06-17 12:11:33 -04:00
committed by letterjay
parent 3fe0ec584c
commit a70cbed1f7
2 changed files with 12 additions and 12 deletions
+9 -7
View File
@@ -284,6 +284,7 @@
previous = null
assigned_transit = null
shuttle_areas = null
remove_ripples()
. = ..()
/obj/docking_port/mobile/Initialize(mapload)
@@ -463,7 +464,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/temp_visual/ripple(t, animate_time)
ripples += new /obj/effect/abstract/ripple(t, animate_time)
/obj/docking_port/mobile/proc/remove_ripples()
for(var/R in ripples)
@@ -478,13 +479,14 @@
for(var/i in 1 to L0.len)
var/turf/T0 = L0[i]
if(!T0 || !istype(T0.loc, area_type))
continue
var/turf/T1 = L1[i]
if(!T1)
continue
if(T0.type != T0.baseturfs)
ripple_turfs += T1
if(!T0 || !T1)
continue // out of bounds
if(T0.type == T0.baseturfs)
continue // indestructible
if(!istype(T0.loc, area_type) || istype(T0.loc, /area/shuttle/transit))
continue // not part of the shuttle
ripple_turfs += T1
return ripple_turfs