diff --git a/code/datums/beepsky_fashion.dm b/code/datums/beepsky_fashion.dm index d9de8e6d7f..0cc0c91f7d 100644 --- a/code/datums/beepsky_fashion.dm +++ b/code/datums/beepsky_fashion.dm @@ -26,8 +26,8 @@ /datum/beepsky_fashion/proc/apply(mob/living/simple_animal/bot/secbot/beepers) //set the emote depending on the fashion datum, if nothing set, turn it back to how it was initially //assume name and description is always set, because otherwise, what would be the point of beepsky fashion? - src.name = name - src.desc = desc + beepers.name = name + beepers.desc = desc if(death_emote) beepers.death_emote = death_emote else @@ -65,6 +65,7 @@ //actual fashions from here on out /datum/beepsky_fashion/wizard + obj_icon_state = "wizard" name = "Archmage Beepsky" desc = "A secbot stolen from the wizard federation." death_emote = "BOT casts EI NATH on themselves!" diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index c03b36d087..479ad1ee09 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -242,6 +242,7 @@ Auto Patrol: []"}, bot_hat = H H.forceMove(src) update_beepsky_fluff() + regenerate_icons() else to_chat(user, "You set [H] on [src]'s head, but it falls off!") H.forceMove(drop_location()) @@ -250,12 +251,17 @@ Auto Patrol: []"}, var/datum/beepsky_fashion/BF = new bot_hat.beepsky_fashion if(BF) BF.apply(src) - regenerate_icons() /mob/living/simple_animal/bot/secbot/regenerate_icons() ..() if(bot_hat) var/datum/beepsky_fashion/fashion = new bot_hat.beepsky_fashion + if(!fashion.obj_icon_state) + fashion.obj_icon_state = bot_hat.icon_state + if(!fashion.obj_alpha) + fashion.obj_alpha = bot_hat.alpha + if(!fashion.obj_color) + fashion.obj_color = bot_hat.color add_overlay(fashion.get_overlay()) /mob/living/simple_animal/bot/secbot/emag_act(mob/user) diff --git a/icons/mob/secbot_head.dmi b/icons/mob/secbot_head.dmi index 2a246b8e42..5e1e57f71c 100644 Binary files a/icons/mob/secbot_head.dmi and b/icons/mob/secbot_head.dmi differ