From 9ec9842f393100ab11f745e1fb124bdfab3d95d6 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Jul 2017 06:07:42 -0500 Subject: [PATCH] Medibots now have the proper icons (#2099) --- .../mob/living/simple_animal/bot/construction.dm | 3 +-- .../modules/mob/living/simple_animal/bot/medbot.dm | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index b3b4725914..2957879162 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -343,8 +343,7 @@ build_step++ to_chat(user, "You complete the Medibot. Beep boop!") var/turf/T = get_turf(src) - var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T) - S.skin = skin + var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T, skin) S.name = created_name qdel(src) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index e5ec8deefe..fdb33ff7b8 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -76,6 +76,9 @@ treatment_tox = "sodium_thiopental" /mob/living/simple_animal/bot/medbot/update_icon() + cut_overlays() + if(skin) + add_overlay("medskin_[skin]") if(!on) icon_state = "medibot0" return @@ -90,17 +93,14 @@ else icon_state = "medibot1" -/mob/living/simple_animal/bot/medbot/Initialize() - ..() - update_icon() - - if(skin) - add_overlay("medskin_[skin]") - +/mob/living/simple_animal/bot/medbot/Initialize(mapload, new_skin) + . = ..() var/datum/job/doctor/J = new /datum/job/doctor access_card.access += J.get_access() prev_access = access_card.access qdel(J) + skin = new_skin + update_icon() /mob/living/simple_animal/bot/medbot/update_canmove() . = ..()