mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-09 16:05:07 +00:00
Fixes multitool/wirecutters interaction with mechs (and wires) (#92821)
## About The Pull Request hi ## Changelog 🆑 fix: Fixed wires interaction and fixed mech multitool/wirecutters interaction. /🆑
This commit is contained in:
@@ -257,12 +257,13 @@
|
||||
|
||||
/datum/wires/proc/interact(mob/user)
|
||||
if(!interactable(user))
|
||||
return
|
||||
return FALSE
|
||||
ui_interact(user)
|
||||
for(var/A in assemblies)
|
||||
var/obj/item/I = assemblies[A]
|
||||
if(istype(I) && I.on_found(user))
|
||||
return
|
||||
break
|
||||
return TRUE
|
||||
|
||||
/**
|
||||
* Checks whether wire assignments should be revealed.
|
||||
|
||||
@@ -269,6 +269,8 @@
|
||||
return part.try_attach_part(user, src, FALSE)
|
||||
|
||||
if(is_wire_tool(tool) && (mecha_flags & PANEL_OPEN))
|
||||
if(user.combat_mode)
|
||||
return
|
||||
if(wires.interact(user))
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user