From 6b5b341a4945de9979207e397a39c253700c129a Mon Sep 17 00:00:00 2001
From: kcin2001 <rnlb2001@gmail.com>
Date: Fri, 21 Jul 2023 23:27:38 -0700
Subject: [PATCH] oversights with borg sprite refactor (#6638)

---
 .../silicon/robot/dogborg/dog_modules_vr.dm   |  1 +
 .../modules/mob/living/silicon/robot/robot.dm | 24 +++++++++++++++----
 .../mob/living/silicon/robot/robot_vr.dm      |  8 -------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
index 8142555d8a..abc81e6df5 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
@@ -538,6 +538,7 @@
 	var/choice = tgui_input_list(M, "Choose your drink!", "Drink Choice", options)
 	if(src && choice && !M.stat && in_range(M,src))
 		icontype = options[choice]
+		selected_icon = module_sprites[icontype][SKIN_ICON_STATE] //CHOMPEdit - sprite selection refactor
 		var/active_sound = 'sound/effects/bubbles.ogg'
 		playsound(src.loc, "[active_sound]", 100, 0, 4)
 		to_chat(M, "<span class='filter_notice'>Your Tank now displays [choice]. Drink up and enjoy!</span>")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index b5140b1b7d..0af60d21ef 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -266,8 +266,16 @@
 			icontype = "Custom"
 		else
 			icontype = module_sprites[1]
-			selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
-			icon_state = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
+			selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit Start- Spriteselector
+			icon_state = module_sprites[icontype][SKIN_ICON_STATE]
+			if (isnull(module_sprites[icontype][SKIN_OFFSET]))
+				pixel_x = 0
+				old_x = 0
+				default_pixel_x = 0
+			else
+				pixel_x = module_sprites[icontype][SKIN_OFFSET]
+				old_x = module_sprites[icontype][SKIN_OFFSET]
+				default_pixel_x = module_sprites[icontype][SKIN_OFFSET]//CHOMPEdit End
 	updateicon()
 	return module_sprites
 
@@ -1078,8 +1086,16 @@
 		else
 			transform_with_anim()	//VOREStation edit end: sprite animation
 
-	selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
-	icon_state = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit - Spriteselector
+	selected_icon = module_sprites[icontype][SKIN_ICON_STATE]//CHOMPEdit Start - Spriteselector
+	icon_state = module_sprites[icontype][SKIN_ICON_STATE]
+	if (isnull(module_sprites[icontype][SKIN_OFFSET]))
+		pixel_x = 0
+		old_x = 0
+		default_pixel_x = 0
+	else
+		pixel_x = module_sprites[icontype][SKIN_OFFSET]
+		old_x = module_sprites[icontype][SKIN_OFFSET]
+		default_pixel_x = module_sprites[icontype][SKIN_OFFSET]//CHOMPEdit End
 	updateicon()
 
 	if (module_sprites.len > 1 && triesleft >= 1 && client)
diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/robot_vr.dm b/modular_chomp/code/modules/mob/living/silicon/robot/robot_vr.dm
index 24ce865b7e..91008fa14d 100644
--- a/modular_chomp/code/modules/mob/living/silicon/robot/robot_vr.dm
+++ b/modular_chomp/code/modules/mob/living/silicon/robot/robot_vr.dm
@@ -73,14 +73,6 @@
 
 /mob/living/silicon/robot/proc/vr_sprite_check()
 	icon = module_sprites[icontype][SKIN_ICON]
-	if (isnull(module_sprites[icontype][SKIN_OFFSET]))
-		pixel_x = 0
-		old_x = 0
-		default_pixel_x = 0
-	else
-		pixel_x = module_sprites[icontype][SKIN_OFFSET]
-		old_x = module_sprites[icontype][SKIN_OFFSET]
-		default_pixel_x = module_sprites[icontype][SKIN_OFFSET]
 
 	if (isnull(module_sprites[icontype][SKIN_HEIGHT]))
 		vis_height = 32