diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index f57933de31..3f2e18e79c 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -50,9 +50,9 @@ R.show_laws() if(WIRE_LOCKDOWN) R.SetLockdown(!R.lockcharge) // Toggle - if(WIRE_RESET_MODULE) - if(R.has_module()) - R.ResetModule() + if(WIRE_RESET_MODULE) + if(R.has_module()) + R.visible_message("[R]'s module servos twitch.", "Your module display flickers.") /datum/wires/robot/on_cut(wire, mend) var/mob/living/silicon/robot/R = holder @@ -74,3 +74,6 @@ R.visible_message("[R]'s camera lense focuses loudly.", "Your camera lense focuses loudly.") if(WIRE_LOCKDOWN) // Simple lockdown. R.SetLockdown(!mend) + if(WIRE_RESET_MODULE) + if(R.has_module() && !mend) + R.ResetModule() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 768ff69166..9574533884 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -195,6 +195,10 @@ if(module.type != /obj/item/weapon/robot_module) return + if(wires.is_cut(WIRE_RESET_MODULE)) + to_chat(src,"ERROR: Module installer reply timeout. Please check internal connections.") + return + var/list/modulelist = list("Standard" = /obj/item/weapon/robot_module/standard, \ "Engineering" = /obj/item/weapon/robot_module/engineering, \ "Medical" = /obj/item/weapon/robot_module/medical, \