Merge pull request #10656 from ShadowLarkens/multitool_and_attackby_fix

Make item/attackby call ..(), multitool tool quality fix
This commit is contained in:
Novacat
2021-06-15 18:59:24 -04:00
committed by Chompstation Bot
parent f3e95e0856
commit 8d0a7af731
2 changed files with 2 additions and 0 deletions
+1
View File
@@ -271,6 +271,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)
@@ -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")