From 433abe79d112afa4a75e0e9dfd00091451a76362 Mon Sep 17 00:00:00 2001 From: PatchouliKnowledge Date: Fri, 17 Oct 2014 23:43:20 +0300 Subject: [PATCH] A less gimmicky way of removing the attack message from goliath plates --- code/game/mecha/mecha.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 1ee9b6435b6..556ad39f389 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -654,7 +654,7 @@ ////// AttackBy ////// ////////////////////// -/obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/mecha/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/device/mmi)) if(mmi_move_inside(W,user)) @@ -663,9 +663,6 @@ user << "[src]-MMI interface initialization failed." return - if(istype(W, /obj/item/asteroid/goliath_hide)) - return - if(istype(W, /obj/item/mecha_parts/mecha_equipment)) var/obj/item/mecha_parts/mecha_equipment/E = W spawn() @@ -768,7 +765,7 @@ user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]") return - else + else if(!(W.flags&NOBLUDGEON)) call((proc_res["dynattackby"]||src), "dynattackby")(W,user) /* src.log_message("Attacked by [W]. Attacker - [user]")