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.
This commit is contained in:
committed by
CitadelStationBot
parent
0d79434b72
commit
6ce76e38d4
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user