From e5eaea8fe1649b72afea4d825d7bfcd3722119ad Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 25 May 2018 11:50:25 -0400
Subject: [PATCH 1/2] Merge pull request #38014 from
 tgstation/KorPhaeron-patch-1

Fixes luxury shuttle forcefields vanishing
---
 code/modules/shuttle/special.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index fdf054720f..a5a15b3d30 100644
--- 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