Merge pull request #6476 from Citadel-Station-13/upstream-merge-37321

[MIRROR] Fixes CTF cheating
2018-04-22 22:21:21 -05:00
parent 8170e2b6c1 05f7e3dd9b
commit f3fb253713
1 changed files with 2 additions and 0 deletions
@@ -66,6 +66,7 @@
 		dropped(user)
 		return
 	user.anchored = TRUE
+	user.status_flags &= ~CANPUSH
 	for(var/mob/M in GLOB.player_list)
 		var/area/mob_area = get_area(M)
 		if(istype(mob_area, /area/ctf))
@@ -76,6 +77,7 @@
 /obj/item/twohanded/ctf/dropped(mob/user)
 	..()
 	user.anchored = FALSE
+	user.status_flags |= CANPUSH
 	reset_cooldown = world.time + 200 //20 seconds
 	START_PROCESSING(SSobj, src)
 	for(var/mob/M in GLOB.player_list)