From 8242b08d28b9ca32c2acb21cabff945aae1f4118 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 20 Nov 2017 13:40:15 -0600 Subject: [PATCH 1/2] Bar Drone can't be remotely detonated (#32908) --- code/modules/shuttle/special.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index f2d451f6e2..6db6e73cff 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -140,6 +140,7 @@ name = "Bardrone" desc = "A barkeeping drone, an indestructible robot built to tend bars." seeStatic = FALSE + hacked = TRUE laws = "1. Serve drinks.\n\ 2. Talk to patrons.\n\ 3. Don't get messed up in their affairs." @@ -227,10 +228,10 @@ /obj/effect/forcefield/luxury_shuttle/CollidedWith(atom/movable/AM) if(!isliving(AM)) return ..() - + if(check_times[AM] && check_times[AM] > world.time) //Let's not spam the message return ..() - + check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN var/total_cash = 0