From 6ce76e38d4ea7532ebe2a86cfbde92f014b18a2d Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Thu, 28 Dec 2017 10:02:55 -0500 Subject: [PATCH] CTF flags are no longer locked to CTF. (#33874) * CTF flags are no longer locked to CTF. * Var added to enable/disable pickup by anybody. --- code/modules/awaymissions/capture_the_flag.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 8b640676ba..657bbb6499 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -26,6 +26,7 @@ flags_2 = SLOWS_WHILE_IN_HAND_2 var/team = WHITE_TEAM var/reset_cooldown = 0 + var/anyonecanpickup = TRUE var/obj/effect/ctf/flag_reset/reset var/reset_path = /obj/effect/ctf/flag_reset @@ -48,7 +49,7 @@ STOP_PROCESSING(SSobj, src) /obj/item/twohanded/ctf/attack_hand(mob/living/user) - if(!is_ctf_target(user)) + if(!is_ctf_target(user) && !anyonecanpickup) to_chat(user, "Non players shouldn't be moving the flag!") return if(team in user.faction)