shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CTF flags are no longer locked to CTF. (#33874)

Browse Source 
* CTF flags are no longer locked to CTF.

* Var added to enable/disable pickup by anybody.
This commit is contained in:
Buggy123
2017-12-29 00:29:42 -06:00
committed by CitadelStationBot
parent 0d79434b72
commit 6ce76e38d4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/capture_the_flag.dm
+2 -1
View File
@@ -26,6 +26,7 @@
flags_2 = SLOWS_WHILE_IN_HAND_2 flags_2 = SLOWS_WHILE_IN_HAND_2
var/team = WHITE_TEAM var/team = WHITE_TEAM
var/reset_cooldown = 0 var/reset_cooldown = 0
var/anyonecanpickup = TRUE
var/obj/effect/ctf/flag_reset/reset var/obj/effect/ctf/flag_reset/reset
var/reset_path = /obj/effect/ctf/flag_reset var/reset_path = /obj/effect/ctf/flag_reset
@@ -48,7 +49,7 @@
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
/obj/item/twohanded/ctf/attack_hand(mob/living/user) /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!") to_chat(user, "Non players shouldn't be moving the flag!")
return return
if(team in user.faction) if(team in user.faction)