From 4daf71d99e8bfecd2cf72904737b2476aecfbdbc Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Tue, 21 Jul 2020 03:34:50 +0100
Subject: [PATCH] woo it works

---
 code/datums/beepsky_fashion.dm                  |   5 +++--
 .../mob/living/simple_animal/bot/secbot.dm      |   8 +++++++-
 icons/mob/secbot_head.dmi                       | Bin 364 -> 370 bytes
 3 files changed, 10 insertions(+), 3 deletions(-)

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, "<span class='warning'>You set [H] on [src]'s head, but it falls off!</span>")
 		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 2a246b8e42281de745b6e6f33e38fb98f88ee343..5e1e57f71c7c9019fce3c3c837687157d6967430 100644
GIT binary patch
delta 58
zcmV-A0LB080`dZoPXTL@P)IAOJhLjXC`E~jGbOXA7^I7fGp#5wHx<M-<Wg2}^>YE6
Q3jkZx8lN(P>MfDIud;U-H2?qr

delta 52
zcmV-40L%aK0_*~iPXT3-P)H?7iHkEOv#1!Po{KZBC^0t`#5UwoR&e!m0h<T_n*SIM
KIiX=hk;AVfdKEJO