diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 740585c820b..3a93f57d60c 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -317,6 +317,11 @@ . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return + if(open) + if(seconds_electrified && get_charge() && shock(user)) + return TRUE + wires.Interact(user) + return TRUE if(!I.multitool_check_buffer(user)) return var/obj/item/multitool/M = I @@ -429,11 +434,6 @@ attacking_core.install(src) update_charge_alert() return TRUE - else if(istype(attacking_item, /obj/item/multitool) && open) - if(seconds_electrified && get_charge() && shock(user)) - return TRUE - wires.Interact(user) - return TRUE else if(open && attacking_item.GetID()) update_access(user, attacking_item.GetID()) return TRUE diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm index a5bb00bea91..36458166ba1 100644 --- a/code/modules/mod/mod_link.dm +++ b/code/modules/mod/mod_link.dm @@ -499,6 +499,7 @@ /proc/call_link(mob/user, datum/mod_link/calling_link) if(!calling_link.frequency) + to_chat(user, "The frequency isn't set!") return var/list/callers = list() for(var/id in GLOB.mod_link_ids)