From cddcd82840cf970e34923ab3e31b63b3d9f5dccf Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 23 Sep 2017 13:52:29 -0500 Subject: [PATCH] Update login.dm --- code/modules/mob/living/silicon/robot/login.dm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm index 852bc2acf2..cf55cdd5f9 100644 --- a/code/modules/mob/living/silicon/robot/login.dm +++ b/code/modules/mob/living/silicon/robot/login.dm @@ -1,15 +1,4 @@ -<<<<<<< HEAD - -/mob/living/silicon/robot/Login() - ..() - regenerate_icons() - show_laws(0) - if(mind) - SSticker.mode.remove_revolutionary(mind) -======= - /mob/living/silicon/robot/Login() ..() regenerate_icons() show_laws(0) ->>>>>>> 0407dcf... Fixes revolutionary deconversion messages and logging (#30956)