diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index 3780cdb683..1d80763fdc 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -6,7 +6,7 @@ name = "diona nymph" voice_name = "diona nymph" speak_emote = list("chirrups") - ico = "nymph" + icon_state = "nymph1" var/list/donors = list() var/ready_evolve = 0 diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index d7add5b088..fe3aeae8ba 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -10,28 +10,27 @@ var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie var/greaterform = "Human" // Used when humanizing a monkey. - var/ico = "monkey" // Used when updating icons. var/uni_append = "12C4E2" // Small appearance modifier for different species. /mob/living/carbon/monkey/tajara name = "farwa" voice_name = "farwa" speak_emote = list("mews") - ico = "tajkey" + icon_state = "tajkey1" uni_append = "0A0E00" /mob/living/carbon/monkey/skrell name = "neaera" voice_name = "neaera" speak_emote = list("squicks") - ico = "skrellkey" + icon_state = "skrellkey1" uni_append = "01CC92" /mob/living/carbon/monkey/unathi name = "stok" voice_name = "stok" speak_emote = list("hisses") - ico = "stokkey" + icon_state = "stokkey1" uni_append = "044C5D" /mob/living/carbon/monkey/New() diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index 660f7f4b83..284f9e288f 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -28,25 +28,25 @@ update_hud() lying_prev = lying //so we don't update overlays for lying/standing unless our stance changes again overlays.Cut() + for(var/image/I in overlays_standing) + overlays += I if(lying) - icon_state = ico + "0" - for(var/image/I in overlays_lying) - overlays += I + var/matrix/M = matrix() + M.Turn(90) + M.Translate(1,-6) + src.transform = M else - icon_state = ico + "1" - for(var/image/I in overlays_standing) - overlays += I + var/matrix/M = matrix() + src.transform = M //////// /mob/living/carbon/monkey/update_inv_wear_mask(var/update_icons=1) if( wear_mask && istype(wear_mask, /obj/item/clothing/mask) ) - overlays_lying[M_MASK_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "[wear_mask.icon_state]2") overlays_standing[M_MASK_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "[wear_mask.icon_state]") wear_mask.screen_loc = ui_monkey_mask else - overlays_lying[M_MASK_LAYER] = null overlays_standing[M_MASK_LAYER] = null if(update_icons) update_icons() @@ -77,11 +77,9 @@ /mob/living/carbon/monkey/update_inv_back(var/update_icons=1) if(back) - overlays_lying[M_BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]2") overlays_standing[M_BACK_LAYER] = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]") back.screen_loc = ui_monkey_back else - overlays_lying[M_BACK_LAYER] = null overlays_standing[M_BACK_LAYER] = null if(update_icons) update_icons() @@ -91,10 +89,8 @@ drop_r_hand() drop_l_hand() stop_pulling() - overlays_lying[M_HANDCUFF_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "handcuff2") overlays_standing[M_HANDCUFF_LAYER] = image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "handcuff1") else - overlays_lying[M_HANDCUFF_LAYER] = null overlays_standing[M_HANDCUFF_LAYER] = null if(update_icons) update_icons() @@ -106,12 +102,10 @@ //Call when target overlay should be added/removed /mob/living/carbon/monkey/update_targeted(var/update_icons=1) if (targeted_by && target_locked) - overlays_lying[TARGETED_LAYER] = target_locked overlays_standing[TARGETED_LAYER] = target_locked else if (!targeted_by && target_locked) del(target_locked) if (!targeted_by) - overlays_lying[TARGETED_LAYER] = null overlays_standing[TARGETED_LAYER] = null if(update_icons) update_icons() diff --git a/icons/mob/monkey.dmi b/icons/mob/monkey.dmi index dd74f422a1..2da3a23473 100644 Binary files a/icons/mob/monkey.dmi and b/icons/mob/monkey.dmi differ