diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm
index 2b2e472760..feb6f1d38a 100644
--- a/code/modules/power/breaker_box.dm
+++ b/code/modules/power/breaker_box.dm
@@ -77,6 +77,17 @@
update_locked = 0
busy = 0
+/obj/machinery/power/breakerbox/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if(istype(W, /obj/item/device/multitool))
+ var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text
+ if(newtag)
+ RCon_tag = newtag
+ user << "You changed the RCON tag to: [newtag]"
+
+
+
+
+
/obj/machinery/power/breakerbox/proc/set_state(var/state)
on = state
if(on)
diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm
index ebb2fab564..72687dfcf6 100644
--- a/code/modules/power/smes_construction.dm
+++ b/code/modules/power/smes_construction.dm
@@ -233,8 +233,15 @@
// - No action was taken in parent function (terminal de/construction atm).
if (..())
+ // Multitool - change RCON tag
+ if(istype(W, /obj/item/device/multitool))
+ var/newtag = input(user, "Enter new RCON tag. Use \"NO_TAG\" to disable RCON or leave empty to cancel.", "SMES RCON system") as text
+ if(newtag)
+ RCon_tag = newtag
+ user << "You changed the RCON tag to: [newtag]"
+ return
// Charged above 1% and safeties are enabled.
- if((charge > (capacity/100)) && safeties_enabled && (!istype(W, /obj/item/device/multitool)))
+ if((charge > (capacity/100)) && safeties_enabled)
user << "Safety circuit of [src] is preventing modifications while it's charged!"
return