From a2a50586b08600283dbeabbd5c4d74e3d3d944d0 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 22 May 2014 15:49:34 -0400 Subject: [PATCH] Trying to fix dodgeball --- code/defines/obj.dm | 6 +++--- code/modules/admin/verbs/onlyoneteam.dm | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index d5ad3439f74..03e5b601c69 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -387,9 +387,9 @@ var/global/list/PDA_Manifest = list() throw_speed = 1 throw_range = 20 flags = FPRINT | TABLEPASS | CONDUCT - afterattack(atom/target as mob|obj|turf|area, mob/user as mob) - user.drop_item() - src.throw_at(target, throw_range, throw_speed) +// afterattack(atom/target as mob|obj|turf|area, mob/user as mob) +// user.drop_item() +// src.throw_at(target, throw_range, throw_speed) /obj/effect/stop var/victim = null diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index f5d570abb59..9ca4bc54f68 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -70,6 +70,8 @@ ..() if((ishuman(hit_atom))) var/mob/living/carbon/human/H = hit_atom + if(src in H.r_hand) return + if(src in H.l_hand) return var/mob/A = H.LAssailant if((H in team_alpha) && (A in team_alpha)) A << "\red He's on your team!"