mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-16 02:17:06 +01:00
Killing off inconsistencies with impact wrenches / combi-tools (#7269)
Part 1 in the "why my impact wrench no wrench bolt" saga tl;dr for end users: combitools / impact wrenches now work on everything their non-powered versions do (except mechs and RIGs, tune in next time on dragon ball Z for that) essentially all this PR does is murder every istype() check possible that could use a helper function instead, most notably many pen checks with ispen(). it also repaths combitools and powerdrills to /obj/item/weapon so they aren't instantly taken out of contention by half of the known attackby() prompts I already squashed a couple runtimes here and there from the pen changes and it's possible I missed another because pencode is another scourge upon our lives
This commit is contained in:
@@ -291,7 +291,7 @@
|
||||
/obj/item/organ/external/hand/right/autakh/tool
|
||||
name = "engineering grasper"
|
||||
action_button_name = "Deploy Mechanical Combitool"
|
||||
var/augment_type = /obj/item/combitool/robotic
|
||||
var/augment_type = /obj/item/weapon/combitool/robotic
|
||||
|
||||
/obj/item/organ/external/hand/right/autakh/tool/refresh_action_button()
|
||||
. = ..()
|
||||
@@ -329,15 +329,15 @@
|
||||
owner.put_in_active_hand(M)
|
||||
owner.visible_message("<span class='notice'>\The [M] slides out of \the [owner]'s [src].</span>","<span class='notice'>You deploy \the [M]!</span>")
|
||||
|
||||
/obj/item/combitool/robotic
|
||||
/obj/item/weapon/combitool/robotic
|
||||
name = "robotic combitool"
|
||||
desc = "An integrated combitool module."
|
||||
icon_state = "digitool"
|
||||
|
||||
/obj/item/combitool/robotic/throw_at()
|
||||
/obj/item/weapon/combitool/robotic/throw_at()
|
||||
usr.drop_from_inventory(src)
|
||||
|
||||
/obj/item/combitool/robotic/dropped()
|
||||
/obj/item/weapon/combitool/robotic/dropped()
|
||||
loc = null
|
||||
qdel(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user