From 48e75791fbbe43d05f0eb3a0cafd81fa91b95bdb Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 10 Nov 2024 17:56:32 +0100
Subject: [PATCH] .

---
 code/modules/mob/living/silicon/robot/robot.dm           | 4 +---
 code/modules/mob/living/silicon/robot/robot_ui_module.dm | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4e7ea7bd00..4b1bb55aec 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -341,11 +341,9 @@
 		var/list/module_sprites = SSrobot_sprites.get_module_sprites(module, src)
 		if(module_sprites.len == 1 || !client)
 			sprite_datum = module_sprites[1]
+			sprite_datum.do_equipment_glamour(module)
 			return
 	new/datum/tgui_module/robot_ui_module(src)
-	if(sprite_datum && module)
-		sprite_datum.do_equipment_glamour(module)
-
 
 /mob/living/silicon/robot/proc/update_braintype()
 	if(istype(mmi, /obj/item/mmi/digital/posibrain))
diff --git a/code/modules/mob/living/silicon/robot/robot_ui_module.dm b/code/modules/mob/living/silicon/robot/robot_ui_module.dm
index addf1bf6ef..708c3c2331 100644
--- a/code/modules/mob/living/silicon/robot/robot_ui_module.dm
+++ b/code/modules/mob/living/silicon/robot/robot_ui_module.dm
@@ -90,6 +90,7 @@
 			R.hud_used.update_robot_modules_display()
 			R.notify_ai(ROBOT_NOTIFICATION_NEW_MODULE, R.module.name)
 			R.robotact?.update_static_data_for_all_viewers()
+			R.sprite_datum = sprite_datum
 			if(!istype(R,/mob/living/silicon/robot/drone))
 				R.sprite_type = sprite_datum.name
 			R.transform_with_anim()
@@ -102,5 +103,6 @@
 				R.resize(tempsize)
 			if(R.hands)
 				R.update_hud()
+			R.sprite_datum.do_equipment_glamour(module)
 			to_chat(R, span_filter_notice("Your icon has been set. You now require a module reset to change it."))
 			tgui_close()