From fd3f5816563bd7a3b955221a29aa032a28b85069 Mon Sep 17 00:00:00 2001 From: ShadowLarkens Date: Sun, 20 Jun 2021 13:51:14 -0700 Subject: [PATCH] Make item/attackby call ..(), multitool tool quality fix (#8145) * Make item/attackby call ..(), multitool tool quality fix * Just don't print item attack messages on attackby --- code/_onclick/item_attack.dm | 5 ----- code/game/objects/items.dm | 1 + code/game/objects/items/devices/multitool.dm | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index dcf4f8957e..762b7baaed 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -41,11 +41,6 @@ avoid code duplication. This includes items that may sometimes act as a standard return TRUE return FALSE -/atom/movable/attackby(obj/item/W, mob/user, var/attack_modifier, var/click_parameters) - . = ..() - if(!. && !(W.flags & NOBLUDGEON)) - visible_message("[src] has been hit by [user] with [W].") - /mob/living/attackby(obj/item/I, mob/user, var/attack_modifier, var/click_parameters) if(!ismob(user)) return 0 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 4432229b6d..966a48141b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -269,6 +269,7 @@ R.hud_used.update_robot_modules_display() /obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob) + . = ..() if(istype(W, /obj/item/weapon/storage)) var/obj/item/weapon/storage/S = W if(S.use_to_pickup) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 837c6616f7..18fc293542 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -29,6 +29,7 @@ var/obj/machinery/connectable //Used to connect machinery. var/weakref_wiring //Used to store weak references for integrated circuitry. This is now the Omnitool. toolspeed = 1 + tool_qualities = list(TOOL_MULTITOOL) /obj/item/device/multitool/attack_self(mob/living/user) var/choice = alert("What do you want to do with \the [src]?","Multitool Menu", "Switch Mode", "Clear Buffers", "Cancel")