Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874

[MIRROR] CTF flags are no longer locked to CTF.

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)