Merge pull request #6896 from Citadel-Station-13/upstream-merge-38014

[MIRROR] Fixes luxury shuttle forcefields vanishing
2018-05-26 18:37:26 -05:00
parent 078200f8fa 3e9c110381
commit 7c201df696
1 changed files with 2 additions and 0 deletions
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -207,10 +207,12 @@
 //Luxury Shuttle Blockers

 /obj/effect/forcefield/luxury_shuttle
+	timeleft = 0
 	var/threshold = 500
 	var/static/list/approved_passengers = list()
 	var/static/list/check_times = list()

+
 /obj/effect/forcefield/luxury_shuttle/CanPass(atom/movable/mover, turf/target)
 	if(mover in approved_passengers)
 		return TRUE