From 9eeb4f0f659d4578d688e3d19b82e5129548e5ae Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Wed, 28 Feb 2018 10:42:40 +0200
Subject: [PATCH] Small wide/dog borg tweaks/fixes -Adds a new var to specify
 nonstandard borg sprite sizes. No longer dogborg exclusive. -Makes the
 dogborg var usable for standard sizes as well (for the special features like
 rest poses and gun/gut overlays) -Makes the borg reset module reset the
 forementioned vars. -Excludes wideborg from the standard size polaris/vore
 vr_sprite_check to avoid unintended default file reverts.

---
 code/game/objects/items/robot/robot_upgrades.dm              | 2 ++
 .../mob/living/silicon/robot/robot_modules/station_vr.dm     | 5 +++++
 code/modules/mob/living/silicon/robot/robot_vr.dm            | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index f10767a49c..57888db514 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -28,6 +28,8 @@
 	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)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
index 75517b86c7..93b3d5ba3b 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
@@ -124,6 +124,7 @@
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
 	R.dogborg = TRUE
+	R.wideborg = TRUE
 	..()
 
 /obj/item/weapon/robot_module/robot/knine/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
@@ -175,6 +176,7 @@
 	R.pixel_x 	 = -16
 	R.old_x  	 = -16
 	R.dogborg = TRUE
+	R.wideborg = TRUE
 	..()
 
 /obj/item/weapon/robot_module/robot/ert
@@ -201,6 +203,7 @@
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
 	R.dogborg = TRUE
+	R.wideborg = TRUE
 	..()
 
 /obj/item/weapon/robot_module/robot/scrubpup
@@ -224,6 +227,7 @@
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
 	R.dogborg = TRUE
+	R.wideborg = TRUE
 	..()
 
 /obj/item/weapon/robot_module/robot/scrubpup/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
@@ -256,5 +260,6 @@
 	R.pixel_x 	 = -16
 	R.old_x 	 = -16
 	R.dogborg = TRUE
+	R.wideborg = TRUE
 	..()
 
diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm
index 2dd54a1e06..c9e6b17606 100644
--- a/code/modules/mob/living/silicon/robot/robot_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_vr.dm
@@ -5,7 +5,8 @@
 	var/pounce_cooldown = 0
 	var/pounce_cooldown_time = 40
 	var/leap_at
-	var/dogborg = FALSE
+	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/vr_icons = list(
 					   "handy-hydro",
@@ -84,6 +85,8 @@
 	return
 
 /mob/living/silicon/robot/proc/vr_sprite_check()
+	if(wideborg == TRUE)
+		return
 	if((icon_state in vr_icons) && (icon == 'icons/mob/robots.dmi'))
 		original_icon = icon
 		icon = 'icons/mob/robots_vr.dmi'