From 2fd4251d0d23922ab8c4e618699452ef816b4e30 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Wed, 17 Feb 2021 16:00:51 +1100 Subject: [PATCH 1/2] Fixes an incorrectly set variable in portaturret code that broke all syndicate shuttle turrets (#56941) Sets a var that was FALSE to TRUE again, so that these turrets can fire once again. Conflicts: code/game/machinery/porta_turret/portable_turret.dm --- code/game/machinery/porta_turret/portable_turret.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 7c83daebbf..b013b84ed3 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -693,7 +693,11 @@ DEFINE_BITFIELD(turret_flags, list( installation = null always_up = 1 use_power = NO_POWER_USE +<<<<<<< HEAD has_cover = 0 +======= + has_cover = FALSE +>>>>>>> 4d40a03... Fixes an incorrectly set variable in portaturret code that broke all syndicate shuttle turrets (#56941) scan_range = 9 req_access = list(ACCESS_SYNDICATE) mode = TURRET_LETHAL From cf8ffbcef34ed504f13c8b04623dc6a9f31bcdcd Mon Sep 17 00:00:00 2001 From: drexample Date: Wed, 17 Feb 2021 05:02:29 +0000 Subject: [PATCH 2/2] Fixes an incorrectly assigned var in syndicate turrets, allowing them to shoot again