From 75106bb789ac12438fa7804e7268fb4a7bfeda8c Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sun, 26 Jun 2016 17:56:55 -0400 Subject: [PATCH] Hopefully fixes THAT ONE BUG (#18926) --- code/game/gamemodes/game_mode.dm | 1 + code/game/objects/items/robot/robot_parts.dm | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index a7c0407d0e88..678c6a66d8fa 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -536,3 +536,4 @@ ticker.mode.remove_revolutionary(newborgie, 0) ticker.mode.remove_gangster(newborgie, 0, remove_bosses=1) ticker.mode.remove_hog_follower(newborgie, 0) + remove_servant_of_ratvar(newborgie.current, TRUE) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index d9977eb9dba7..b29313d8374e 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -247,10 +247,7 @@ BM.mind.transfer_to(O) if(M.clockwork) - O.emagged = 1 - O.visible_message("[M]'s eyes glow a blazing yellow!", \ - "As you serve Ratvar, your onboard camera is not active and your safeties are disabled.") - ticker.mode.update_servant_icons_added(O.mind) + add_servant_of_ratvar(O) if(O.mind && O.mind.special_role) O.mind.store_memory("As a cyborg, you must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.")