Dogborg fixes (#7212)

modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm

@@ -2,6 +2,7 @@
 	name = "ServicehoundV2 - Alt"
 	sprite_icon = 'modular_chomp/icons/mob/widerobot_ch.dmi'
 	sprite_icon_state = "servborg"
+	rest_sprite_options = list("Default")
 	has_eye_light_sprites = TRUE
 
 /datum/robot_sprite/dogborg/service/cat
@@ -11,6 +12,7 @@
 	has_vore_belly_resting_sprites = TRUE
 	has_eye_light_sprites = TRUE
 
+/*Upstream implemented
 /datum/robot_sprite/dogborg/tall/service
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
 
@@ -28,17 +30,15 @@
 	sprite_icon_state = "mekaserve"
 	has_vore_belly_sprites = TRUE
 
-/datum/robot_sprite/dogborg/tall/service/meka_alt
-	sprite_icon_state = "mekaserve_alt"
-	has_vore_belly_sprites = TRUE
-
 /datum/robot_sprite/dogborg/tall/service/mmeka
 	sprite_icon_state = "mmekaserv"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/service/fmeka
 	sprite_icon_state = "fmekaserv"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/service/k4t
 	sprite_icon_state = "k4tserve"
@@ -47,3 +47,11 @@
 /datum/robot_sprite/dogborg/tall/service/k4t_alt1
 	sprite_icon_state = "k4tserve_alt1"
 	has_vore_belly_sprites = FALSE
+*/
+
+/datum/robot_sprite/dogborg/tall/service/mekaserve_alt
+	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
+	name = "MEKA Alt"
+	pixel_x = 0
+	sprite_icon_state = "mekaserve_alt"
+	rest_sprite_options = list("Default", "Sit")

modular_chomp/code/modules/mob/living/silicon/robot/sprites/clown.dm

@@ -10,6 +10,7 @@
 /datum/robot_sprite/dogborg/tall/clown
 	module_type = "Clown"
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
+	pixel_x = 0
 
 /datum/robot_sprite/dogborg/tall/clown/k4t
 	name = "K4T"

modular_chomp/code/modules/mob/living/silicon/robot/sprites/combat.dm

@@ -1,23 +1,24 @@
-/datum/robot_sprite/dogborg/tall/combat
+/datum/robot_sprite/dogborg/tall/combat/ch
 	module_type = "Combat"
-	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'	
+	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
+	pixel_x = 0
 
-/datum/robot_sprite/dogborg/tall/combat/meka
+/datum/robot_sprite/dogborg/tall/combat/ch/meka
 	name = "MEKA"
 	sprite_icon_state = "mekasyndi"
 	has_vore_belly_sprites = TRUE
 
-/datum/robot_sprite/dogborg/tall/combat/mmeka
+/datum/robot_sprite/dogborg/tall/combat/ch/mmeka
 	name = "NIKO"
 	sprite_icon_state = "mmekasyndi"
 	has_vore_belly_sprites = TRUE
 
-/datum/robot_sprite/dogborg/tall/combat/fmeka
+/datum/robot_sprite/dogborg/tall/combat/ch/fmeka
 	name = "NIKA"
 	sprite_icon_state = "fmekasyndi"
 	has_vore_belly_sprites = TRUE
 
-/datum/robot_sprite/dogborg/tall/combat/k4t
+/datum/robot_sprite/dogborg/tall/combat/ch/k4t
 	name = "K4T"
 	sprite_icon_state = "k4tsyndi"
 	has_vore_belly_sprites = FALSE

modular_chomp/code/modules/mob/living/silicon/robot/sprites/command.dm

@@ -15,6 +15,7 @@
 /datum/robot_sprite/dogborg/tall/command
 	module_type = "Command"
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
+	pixel_x = 0
 
 /datum/robot_sprite/dogborg/raptor/command
 	module_type = "Command"

modular_chomp/code/modules/mob/living/silicon/robot/sprites/engineering.dm

@@ -5,6 +5,7 @@
 	has_eye_light_sprites = TRUE
 	has_vore_belly_resting_sprites = TRUE
 
+/*Upstream implemented
 /datum/robot_sprite/dogborg/tall/engineering
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
 
@@ -18,6 +19,7 @@
 /datum/robot_sprite/dogborg/tall/engineering/meka
 	sprite_icon_state = "mekaengi"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/engineering/mmeka
 	sprite_icon_state = "mmekaeng"
@@ -34,3 +36,4 @@
 /datum/robot_sprite/dogborg/tall/engineering/k4t_alt1
 	sprite_icon_state = "k4tengi_alt1"
 	has_vore_belly_sprites = FALSE
+*/

modular_chomp/code/modules/mob/living/silicon/robot/sprites/exploration.dm

@@ -16,6 +16,7 @@
 /datum/robot_sprite/dogborg/tall/explorer
 	module_type = "Exploration"
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
+	pixel_x = 0
 
 /datum/robot_sprite/dogborg/raptor/explorer
 	module_type = "Exploration"

modular_chomp/code/modules/mob/living/silicon/robot/sprites/janitor.dm

@@ -12,7 +12,7 @@
 	has_eye_light_sprites = TRUE
 
 // Tall sprites
-
+/*Upstream implemented
 /datum/robot_sprite/dogborg/tall/janitor
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
 
@@ -25,20 +25,21 @@
 
 /datum/robot_sprite/dogborg/tall/janitor/meka
 	sprite_icon_state = "mekajani"
-	has_vore_belly_sprites = TRUE
+	has_vore_belly_sprites = FALSE //These three oddly dont have sleeper sprites. -Reo
 
 /datum/robot_sprite/dogborg/tall/janitor/mmeka
 	sprite_icon_state = "mmekajani"
-	has_vore_belly_sprites = TRUE
+	has_vore_belly_sprites = FALSE //Second without
 
 /datum/robot_sprite/dogborg/tall/janitor/fmeka
 	sprite_icon_state = "fmekajani"
-	has_vore_belly_sprites = TRUE
+	has_vore_belly_sprites = FALSE //Third without
 
 /datum/robot_sprite/dogborg/tall/janitor/k4t
-	sprite_icon_state = "k4janit"
+	sprite_icon_state = "k4tjani"
 	has_vore_belly_sprites = FALSE
 
-/datum/robot_sprite/dogborg/tall/mining/k4t_alt1
+/datum/robot_sprite/dogborg/tall/janitor/k4t_alt1
 	sprite_icon_state = "k4tjani_alt1"
 	has_vore_belly_sprites = FALSE
+*/

modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm

@@ -1,5 +1,5 @@
 //probably have alot of duplicated sprites with my lazy way of moving the surgeon sprites into crisis
-
+/*Upstream implemented
 /datum/robot_sprite/medical
 	module_type = list("Crisis", "Surgeon")
 	sprite_icon = 'icons/mob/robot/medical.dmi'
@@ -11,15 +11,18 @@
 
 /datum/robot_sprite/dogborg/tall/medical/meka
 	sprite_icon_state = "mekamed"
-	has_vore_belly_sprites = TRUE
-
+	has_vore_belly_sprites = TRUE		// These have R/G belly icons, but they're the same. Im adding them in as colored because
+	has_sleeper_light_indicator = TRUE	// they were the only meka icons to not have a belly icon without the red/green color system.
+										// Maybe someone plans to come back later and add them? This will give that support I guess. -Reo
 /datum/robot_sprite/dogborg/tall/medical/mmeka
 	sprite_icon_state = "mmekamed"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/medical/fmeka
 	sprite_icon_state = "fmekamed"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/medical/k4t
 	sprite_icon_state = "k4tmed"
@@ -29,30 +32,34 @@
 	sprite_icon_state = "k4tmed_alt1"
 	has_vore_belly_sprites = FALSE
 
-
+*/
 // Surgeon
 
 // Regular sprites
 
 /datum/robot_sprite/surgical
 	module_type = "Crisis"
+	sprite_icon = 'icons/mob/robot/surgical.dmi'
 
 /datum/robot_sprite/dogborg/surgical
 	module_type = "Crisis"
+	sprite_icon = 'icons/mob/robot/surgical_wide.dmi'
 
 // Tall sprites
 
 /datum/robot_sprite/dogborg/tall/surgical
 	module_type = "Crisis"
-	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
+	sprite_icon = 'icons/mob/robot/surgical_large.dmi'
 
 /datum/robot_sprite/dogborg/raptor/surgical
 	module_type = "Crisis"
-	sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi'
+	sprite_icon = 'icons/mob/robot/surgical_large.dmi'
 
 /datum/robot_sprite/dogborg/raptor/surgical/raptor
 	name = "Raptor V-4 - Surgical"
-	sprite_icon_state = "traumaraptor"
+	sprite_icon_state = "raptor"
+	has_custom_equipment_sprites = TRUE
+	rest_sprite_options = list("Default", "Bellyup")
 
 /datum/robot_sprite/dogborg/crisis/vale2
 	name = "Mediborg Model V-3"
@@ -74,9 +81,11 @@
 
 /datum/robot_sprite/dogborg/raptor/crisis
 	module_type = "Crisis"
-	sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi'
+	sprite_icon = 'icons/mob/robot/crisis_large.dmi'
 
 
 /datum/robot_sprite/dogborg/raptor/crisis/raptor
 	name = "Raptor V-4 - Crisis"
 	sprite_icon_state = "medraptor"
+	has_custom_equipment_sprites = TRUE
+	rest_sprite_options = list("Default", "Bellyup")

modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm

@@ -12,6 +12,7 @@
 	has_vore_belly_resting_sprites = TRUE
 	has_eye_light_sprites = TRUE
 
+/*Upstream implemented
 /datum/robot_sprite/dogborg/tall/mining
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
 
@@ -24,10 +25,12 @@
 	sprite_icon_state = "mineraptor"
 	has_custom_equipment_sprites = TRUE
 	rest_sprite_options = list("Default", "Bellyup")
+*/
 
+//redefining the upstream modules, using the proper sprites from there to use another name.
 /datum/robot_sprite/dogborg/tall/mining/meka
 	name = "MEKA - Mining"
-	sprite_icon_state = "mekamine"
+	sprite_icon_state = "meka"
 	has_eye_light_sprites = TRUE
 	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = FALSE
@@ -35,21 +38,21 @@
 
 /datum/robot_sprite/dogborg/tall/mining/mmeka
 	name = "NIKO - Mining"
-	sprite_icon_state = "mmekamine"
+	sprite_icon_state = "mmeka"
 	has_eye_light_sprites = TRUE
 	has_custom_open_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
 /datum/robot_sprite/dogborg/tall/mining/fmeka
 	name = "NIKA - Mining"
-	sprite_icon_state = "fmekamine"
+	sprite_icon_state = "fmeka"
 	has_eye_light_sprites = TRUE
 	has_custom_open_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
 /datum/robot_sprite/dogborg/tall/mining/k4t
 	name = "K4T - Mining"
-	sprite_icon_state = "k4tmine"
+	sprite_icon_state = "k4t"
 	has_eye_light_sprites = TRUE
 	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = FALSE
@@ -57,46 +60,48 @@
 
 /datum/robot_sprite/dogborg/tall/mining/k4t_alt1
 	name = "K4Talt - Mining"
-	sprite_icon_state = "k4tmine_alt1"
+	sprite_icon_state = "k4t_alt1"
 	has_eye_light_sprites = TRUE
 	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = FALSE
 	rest_sprite_options = list("Default", "Bellyup")
 
-/datum/robot_sprite/dogborg/tall/mining/mekacargo
+//Upstream does not have those, if we want them, we should add them on top now
+/datum/robot_sprite/dogborg/tall/mining/ch
+	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
+	pixel_x = 0
+
+/datum/robot_sprite/dogborg/tall/mining/ch/mekacargo
 	name = "MEKA - Cargo"
 	sprite_icon_state = "mekacargo"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = FALSE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/mining/mmekacargo
+/datum/robot_sprite/dogborg/tall/mining/ch/mmekacargo
 	name = "NIKO - Cargo"
 	sprite_icon_state = "mmekacargo"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/mining/fmekacargo
+/datum/robot_sprite/dogborg/tall/mining/ch/fmekacargo
 	name = "NIKA - Cargo"
 	sprite_icon_state = "fmekacargo"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/mining/k4tcargo
+/datum/robot_sprite/dogborg/tall/mining/ch/k4tcargo
 	name = "K4T - Cargo"
 	sprite_icon_state = "k4tcargo"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = FALSE
 	rest_sprite_options = list("Default", "Bellyup")
 
-/datum/robot_sprite/dogborg/tall/mining/k4t_alt1cargo
+/datum/robot_sprite/dogborg/tall/mining/ch/k4t_alt1cargo
 	name = "K4Talt - Cargo"
 	sprite_icon_state = "k4tcargo_alt1"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = FALSE
 	rest_sprite_options = list("Default", "Bellyup")

modular_chomp/code/modules/mob/living/silicon/robot/sprites/science.dm

@@ -9,7 +9,7 @@
 	has_eye_light_sprites = TRUE
 
 // Tall sprites
-
+/*Upstream implemented
 /datum/robot_sprite/dogborg/tall/science
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
 
@@ -23,15 +23,20 @@
 /datum/robot_sprite/dogborg/tall/science/meka
 	sprite_icon_state = "mekastandard" //placeholder because i think virgo did that too and i dont want to reoverride the dmi just for this
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/science/mmeka
 	sprite_icon_state = "mmekasci"
-	has_vore_belly_sprites = FALSE
+	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/science/fmeka
 	sprite_icon_state = "fmekasci"
-	has_vore_belly_sprites = FALSE
+	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/science/k4t
 	sprite_icon_state = "k4tsci"
-	has_vore_belly_sprites = FALSE
+	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
+*/

modular_chomp/code/modules/mob/living/silicon/robot/sprites/security.dm

@@ -17,7 +17,7 @@
 	has_taser_sprite = FALSE //ditto
 
 // Tall sprites
-
+/*Upstream implemented
 /datum/robot_sprite/dogborg/tall/security
 	module_type = "Security"
 	sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi'
@@ -32,15 +32,19 @@
 /datum/robot_sprite/dogborg/tall/security/meka
 	sprite_icon_state = "mekasec"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/security/mmeka
 	sprite_icon_state = "mmekasec"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/security/fmeka
 	sprite_icon_state = "fmekasec"
 	has_vore_belly_sprites = TRUE
+	has_sleeper_light_indicator = TRUE
 
 /datum/robot_sprite/dogborg/tall/security/k4t
 	sprite_icon_state = "k4tsec"
 	has_vore_belly_sprites = FALSE
+*/