From df15e53cd3113648506a8e82d1b54461fa1ed822 Mon Sep 17 00:00:00 2001 From: Useroth Date: Sat, 27 Apr 2019 21:04:24 +0200 Subject: [PATCH] Another attempt at the nets not being breakable with bare hands. Now with more consideration. --- .../ninja/suit/n_suit_verbs/energy_net_nets.dm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm index bdc9ca9fdb..58183a8226 100644 --- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm +++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm @@ -108,9 +108,19 @@ It is possible to destroy the net by the occupant or someone else. playsound(affecting, 'sound/effects/sparks2.ogg', 50, 1) new /obj/effect/temp_visual/dir_setting/ninja/phase(affecting.drop_location(), affecting.dir) -/obj/structure/energy_net/attack_paw(mob/user) - //return attack_hand() //How about no barehanded breaking of the net? - return +/obj/structure/energy_net/attackby(obj/item/I, mob/user, params) + + if(istype(user, /mob/living/carbon/alien/humanoid)) //so that aliums aren't completely cucked by nets + return attack_hand(user) + if(!I) + return + if(!I.force) + return + + return attack_hand(user) + +/*/obj/structure/energy_net/attack_paw(mob/user) + return attack_hand()*/ //How about no barehanded breaking of the net? /obj/structure/energy_net/user_buckle_mob(mob/living/M, mob/living/user) return//We only want our target to be buckled