From 4e9cff854de6dd96a60be88744dba4103a0b526e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 10 Mar 2018 07:36:00 -0600 Subject: [PATCH] [MIRROR] Turrets can be set to shoot people without loyalty implants (#5888) * Turrets can be set to shoot people without loyalty implants (#36226) * adds feature to turrets allowing them to be toggled to shoot people who have not been loyalty implanted * Fixed mistake left when changing variable names * Turrets can be set to shoot people without loyalty implants --- code/game/machinery/porta_turret/portable_turret.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 2b442401e2..dffb4650e8 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -62,6 +62,7 @@ var/auth_weapons = 0 //checks if it can shoot people that have a weapon they aren't authorized to have var/stun_all = 0 //if this is active, the turret shoots everything that isn't security or head of staff var/check_anomalies = 1 //checks if it can shoot at unidentified lifeforms (ie xenos) + var/shoot_unloyal = 0 //checks if it can shoot people that aren't loyalty implantd var/attacked = 0 //if set to 1, the turret gets pissed off and shoots at people nearby (unless they have sec access!) @@ -177,6 +178,7 @@ dat += "Neutralize Identified Criminals: [criminals ? "Yes" : "No"]
" dat += "Neutralize All Non-Security and Non-Command Personnel: [stun_all ? "Yes" : "No"]
" dat += "Neutralize All Unidentified Life Signs: [check_anomalies ? "Yes" : "No"]
" + dat += "Neutralize All Non-Loyalty Implanted Personnel: [shoot_unloyal ? "Yes" : "No"]
" var/datum/browser/popup = new(user, "autosec", "Automatic Portable Turret Installation", 300, 300) popup.set_content(dat) @@ -208,6 +210,8 @@ stun_all = !stun_all if("checkxenos") check_anomalies = !check_anomalies + if("checkloyal") + shoot_unloyal = !shoot_unloyal interact(usr) /obj/machinery/porta_turret/power_change() @@ -484,6 +488,10 @@ if(!R || (R.fields["criminal"] == "*Arrest*")) threatcount += 4 + if(shoot_unloyal) + if (!perp.isloyal()) + threatcount += 4 + return threatcount