From 75a49c53c819d3d5cb47ae2f4a87482825911499 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 1 Apr 2018 04:06:10 -0500 Subject: [PATCH] Fixes dogborg sitting (#6112) --- .../modules/mob/living/silicon/robot/robot.dm | 2 ++ .../modules/mob/living/silicon/robot/robot.dm | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2a3af029dd..6fce5a15f3 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -159,6 +159,8 @@ toner = tonermax diag_hud_set_borgcell() + verbs += /mob/living/proc/lay_down //CITADEL EDIT gimmie rest verb kthx + //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO /mob/living/silicon/robot/Destroy() if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside. diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot.dm index 34970bc283..da77421a2f 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/robot.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot.dm @@ -1,10 +1,19 @@ +mob/living/silicon + no_vore = TRUE + /mob/living/silicon/robot var/dogborg = FALSE /mob/living/silicon/robot/lay_down() - if(resting) - cut_overlays() - icon_state = "[module.cyborg_base_icon]-rest" - else - icon_state = "[module.cyborg_base_icon]" + ..() + update_canmove() + +/mob/living/silicon/robot/update_canmove() + ..() + if(client && stat != DEAD && dogborg == TRUE) + if(resting) + cut_overlays() + icon_state = "[module.cyborg_base_icon]-rest" + else + icon_state = "[module.cyborg_base_icon]" update_icons() \ No newline at end of file