Merge pull request #3189 from Verkister/moreborgostuff

Readies our borg stuff for next sync fixes.

code/_onclick/hud/robot.dm

@@ -278,4 +278,4 @@ var/obj/screen/robot_inventory
 /mob/living/silicon/robot/update_hud()
 	..()
 	if(modtype)
-		hands.icon_state = lowertext(modtype)
+		hands.icon_state = lowertext(modtype)

code/_onclick/hud/robot_vr.dm

@@ -0,0 +1,6 @@
+/mob/living/silicon/robot/update_hud()
+	if(ui_style_vr)
+		hands.icon = 'icons/mob/screen1_robot_vr.dmi'
+	if(modtype)
+		hands.icon_state = lowertext(modtype)
+	..()

code/game/objects/items/robot/robot_upgrades.dm

@@ -26,14 +26,10 @@
 
 /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
 	if(..()) return 0
-	R.pixel_x = initial(pixel_x) //VOREStation Edit
-	R.pixel_y = initial(pixel_y) //VOREStation Edit
-	R.dogborg = FALSE //VOREStation Edit
-	R.wideborg = FALSE //VOREStation Edit
 	R.uneq_all()
 	R.modtype = initial(R.modtype)
 	R.hands.icon_state = initial(R.hands.icon_state)
-	R.icon = initial(R.icon) //VOREStation Edit - Dogborg reset tweak since separate file.
+
 	R.notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, R.module.name)
 	R.module.Reset(R)
 	qdel(R.module)

code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm

@@ -120,6 +120,7 @@
 	src.emag 	 = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem.
 	R.icon 		 = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
+	R.ui_style_vr = TRUE
 	//R.icon_state = "k9"
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
@@ -173,6 +174,7 @@
 	src.emag 	 = new /obj/item/weapon/dogborg/pounce(src) //Pounce
 	R.icon = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
+	R.ui_style_vr = TRUE
 	//R.icon_state = "medihound"
 	R.pixel_x 	 = -16
 	R.old_x  	 = -16
@@ -202,6 +204,7 @@
 	src.emag     = new /obj/item/weapon/gun/energy/laser/mounted(src)
 	R.icon 		 = 'icons/mob/64x64robot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
+	R.ui_style_vr = TRUE
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
 	R.default_pixel_x = -16
@@ -226,6 +229,7 @@
 	src.emag 	 = new /obj/item/weapon/dogborg/pounce(src) //Pounce
 	R.icon 		 = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
+	R.ui_style_vr = TRUE
 	//R.icon_state = "scrubpup"
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
@@ -260,6 +264,7 @@
 	src.emag = new /obj/item/weapon/hand_tele(src)
 	R.icon 		 = 'icons/mob/widerobot_vr.dmi'
 	R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
+	R.ui_style_vr = TRUE
 	//R.icon_state = "science"
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
@@ -268,3 +273,12 @@
 	R.wideborg = TRUE
 	..()
 
+/obj/item/weapon/robot_module/Reset(var/mob/living/silicon/robot/R)
+	R.pixel_x = initial(pixel_x)
+	R.pixel_y = initial(pixel_y)
+	R.icon = initial(R.icon)
+	R.dogborg = FALSE
+	R.wideborg = FALSE
+	R.ui_style_vr = FALSE
+	R.default_pixel_x = initial(pixel_x)
+	..()

code/modules/mob/living/silicon/robot/robot_vr.dm

@@ -8,6 +8,7 @@
 	var/dogborg = FALSE //Dogborg special features (overlays etc.)
 	var/wideborg = FALSE //When the borg simply doesn't use standard 32p size.
 	var/original_icon = 'icons/mob/robots.dmi'
+	var/ui_style_vr = FALSE //Do we use our hud icons?
 	var/vr_icons = list(
 					   "handy-hydro",
 					   "handy-service",

vorestation.dme

@@ -123,6 +123,7 @@
 #include "code\_onclick\hud\movable_screen_objects.dm"
 #include "code\_onclick\hud\other_mobs.dm"
 #include "code\_onclick\hud\robot.dm"
+#include "code\_onclick\hud\robot_vr.dm"
 #include "code\_onclick\hud\screen_objects.dm"
 #include "code\_onclick\hud\screen_objects_vr.dm"
 #include "code\_onclick\hud\spell_screen_objects.dm"