From 131978db2dfb8d6139ee1bf4d8316047138844c2 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Mon, 9 Jan 2017 21:11:48 -0800 Subject: [PATCH] Borgs now actually have their module actions revoked upon module removal --- code/game/machinery/cryopod.dm | 1 + code/game/objects/items/robot/robot_upgrades.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index e48a5f44b32..1d9e02f52a1 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -705,6 +705,7 @@ for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags O.loc = R qdel(I) + R.module.remove_subsystems_and_actions(R) qdel(R.module) return ..() diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index ffb1d31faa8..bd6f3acfdee 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -35,6 +35,7 @@ R.uneq_all() R.hands.icon_state = "nomod" R.icon_state = "robot" + R.module.remove_subsystems_and_actions(R) qdel(R.module) R.module = null @@ -328,4 +329,4 @@ to_chat(cyborg, "Self-repair is active in [msgmode] mode.") msg_cooldown = world.time else - deactivate() \ No newline at end of file + deactivate()