cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

shuffle wire interact + add warning when calling without a freq (#29362)

Browse Source
This commit is contained in:
Toastical
2025-05-30 19:49:35 +00:00
committed by GitHub
parent c52cc0f3a8
commit 812bc63308
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/mod_control.dm
+5 -5
View File
@@ -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
code/modules/mod/mod_link.dm
+1
View File
@@ -499,6 +499,7 @@
/proc/call_link(mob/user, datum/mod_link/calling_link)
if(!calling_link.frequency)
to_chat(user, "<span class='warning'>The frequency isn't set!</span>")
return
var/list/callers = list()
for(var/id in GLOB.mod_link_ids)