dullahan/smolraptor bug fixes and syndicate + clownborg additions! (#8787)

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

@@ -20,24 +20,22 @@
 	rest_sprite_options = list("Default", "Sit")
 
 
-/datum/robot_sprite/dogborg/tall/service/dullahanservice
+/datum/robot_sprite/dogborg/tall/service/dullahan
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_serv.dmi'
-	name = "Dullahan"
 	pixel_x = 0
+
+/datum/robot_sprite/dogborg/tall/service/dullahan/service
+	name = "Dullahan"
 	sprite_icon_state = "dullahanserv"
 	rest_sprite_options = list("Default", "Sit")
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 
-/datum/robot_sprite/dogborg/tall/service/dullahanservicealt
-	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_serv.dmi'
+/datum/robot_sprite/dogborg/tall/service/dullahan/servicealt
 	name = "Dullahan v2"
-	pixel_x = 0
 	sprite_icon_state = "dullahanserv_alt"
 	rest_sprite_options = list("Default", "Sit")
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 
 /datum/robot_sprite/dogborg/service/smolraptorservicesprite
@@ -47,6 +45,5 @@
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -19,3 +19,16 @@
 	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = FALSE
 	rest_sprite_options = list("Default", "Bellyup")
+
+/datum/robot_sprite/dogborg/tall/clown/dullahan
+	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_clown.dmi'
+	pixel_x = 0
+
+/datum/robot_sprite/dogborg/tall/clown/dullahan/clown
+	name = "Dullahan Clown"
+	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_clown.dmi'
+	sprite_icon_state = "dullahanclown"
+	has_eye_light_sprites = TRUE
+	has_vore_belly_sprites = TRUE
+	rest_sprite_options = list("Default", "Sit")
+	pixel_x = 0

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

@@ -58,6 +58,5 @@
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -6,24 +6,22 @@
 	has_vore_belly_resting_sprites = TRUE
 
 
-/datum/robot_sprite/dogborg/engineering/dullahanengineering
-	name = "Dullahan"
+/datum/robot_sprite/dogborg/engineering/dullahan
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_eng.dmi'
-	sprite_icon_state = "dullahaneng"
 	pixel_x = 0
+
+/datum/robot_sprite/dogborg/engineering/dullahan/engineer
+	name = "Dullahan"
+	sprite_icon_state = "dullahaneng"
 	rest_sprite_options = list("Default", "Sit")
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 
-/datum/robot_sprite/dogborg/engineering/dullahanengineeringalt
+/datum/robot_sprite/dogborg/engineering/dullahan/engineeralt
 	name = "Dullahan v2"
-	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_eng.dmi'
 	sprite_icon_state = "dullahaneng_alt"
-	pixel_x = 0
 	rest_sprite_options = list("Default", "Sit")
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 
 /datum/robot_sprite/dogborg/engineering/smolraptorengineeringsprite
@@ -33,6 +31,5 @@
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -22,7 +22,6 @@
 	name = "Dullahan"
 	sprite_icon_state = "dullahanexplo"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
@@ -30,7 +29,6 @@
 	name = "Dullahan v2"
 	sprite_icon_state = "dullahanexplo_alt"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 

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

@@ -12,28 +12,24 @@
 	has_eye_light_sprites = TRUE
 
 
-/datum/robot_sprite/dogborg/tall/dullahanjanitormodule
+/datum/robot_sprite/dogborg/tall/dullahan
 	module_type = "Janitor"
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_jani.dmi'
+	pixel_x = 0
 
-
-/datum/robot_sprite/dogborg/tall/dullahanjanitormodule/dullahanjanitor
+/datum/robot_sprite/dogborg/tall/dullahan/janitor
 	name = "Dullahan"
 	sprite_icon_state = "dullahanjani"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
-	pixel_x = 0
 
-/datum/robot_sprite/dogborg/tall/dullahanjanitormodule/dullahanjanitoralt
+/datum/robot_sprite/dogborg/tall/dullahan/janitoralt
 	name = "Dullahan v2"
 	sprite_icon_state = "dullahanjani_alt"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
-	pixel_x = 0
 
 /datum/robot_sprite/dogborg/smolraptorjanitorsprite
 	sprite_icon = 'modular_chomp/icons/mob/smallraptors/smolraptor_jani.dmi'
@@ -43,6 +39,5 @@
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -102,38 +102,31 @@
 	has_dead_sprite = TRUE
 
 
-/datum/robot_sprite/dogborg/tall/dullahancrisismodule
+/datum/robot_sprite/dogborg/tall/dullahan
 	module_type = "Crisis"
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_med.dmi'
 	pixel_x = 0
-
-/datum/robot_sprite/dogborg/tall/dullahancrisismodule/dullcrisis
+/datum/robot_sprite/dogborg/tall/dullahan/crisis
 	name = "Dullahan"
 	sprite_icon_state = "dullahanmed"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
-	pixel_x = 0
 
-
-/datum/robot_sprite/dogborg/tall/dullahancrisismodule/dullcrisisalt
+/datum/robot_sprite/dogborg/tall/dullahan/crisisalt
 	name = "Dullahan v2"
 	sprite_icon_state = "dullahanmed_alt"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
-	pixel_x = 0
 
-/datum/robot_sprite/dogborg/smolraptormedicalsprite
+/datum/robot_sprite/dogborg/smolraptor
 	sprite_icon = 'modular_chomp/icons/mob/smallraptors/smolraptor_med.dmi'
 	module_type = "Crisis"
 
-/datum/robot_sprite/dogborg/smolraptormedicalsprite/smolraptormed
+/datum/robot_sprite/dogborg/smolraptor/crisis
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -71,11 +71,11 @@
 	has_vore_belly_sprites = FALSE
 	rest_sprite_options = list("Default", "Bellyup")
 
-/datum/robot_sprite/dogborg/tall/mining/dullahanminermodule
+/datum/robot_sprite/dogborg/tall/mining/dullahan
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_mine.dmi'
 	pixel_x = 0
 
-/datum/robot_sprite/dogborg/tall/mining/dullahanminermodule/dullahanminer
+/datum/robot_sprite/dogborg/tall/mining/dullahan/miner
 	name = "Dullahan Mining unit"
 	sprite_icon_state = "dullahanmine"
 	has_eye_light_sprites = TRUE
@@ -83,7 +83,7 @@
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/mining/dullahanminermodule/dullahanmineralt
+/datum/robot_sprite/dogborg/tall/mining/dullahan/mineralt
 	name = "Dullahan Mining unit v2"
 	sprite_icon_state = "dullahanmine_alt"
 	has_eye_light_sprites = TRUE
@@ -91,45 +91,41 @@
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/mining/dullahancargomodule
+/datum/robot_sprite/dogborg/tall/mining/dullahancarg
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_cargo.dmi'
 	pixel_x = 0
 
-/datum/robot_sprite/dogborg/tall/mining/dullahancargomodule/dullahancargo
+/datum/robot_sprite/dogborg/tall/mining/dullahancarg/cargo
 	name = "Dullahan Cargo"
 	sprite_icon_state = "dullahancargo"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/tall/mining/dullahancargomodule/dullahancargoalt
+/datum/robot_sprite/dogborg/tall/mining/dullahancarg/cargoalt
 	name = "Dullahan Cargo v2"
 	sprite_icon_state = "dullahancargo_alt"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/mining/smolraptorminersprite
+/datum/robot_sprite/dogborg/mining/smolraptorminer
 	sprite_icon = 'modular_chomp/icons/mob/smallraptors/smolraptor_min.dmi'
 
-/datum/robot_sprite/dogborg/mining/smolraptorcargosprite
+/datum/robot_sprite/dogborg/mining/smolraptorcargo
 	sprite_icon = 'modular_chomp/icons/mob/smallraptors/smolraptor_car.dmi'
 
 
-/datum/robot_sprite/dogborg/mining/smolraptorminersprite/smolraptorminer
+/datum/robot_sprite/dogborg/mining/smolraptorminer/miner
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")
 
-/datum/robot_sprite/dogborg/mining/smolraptorcargosprite/smolraptorcargo
+/datum/robot_sprite/dogborg/mining/smolraptorcargo/cargo
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -9,35 +9,32 @@
 	has_eye_light_sprites = TRUE
 
 
-/datum/robot_sprite/dogborg/tall/science/dullahanscience
-	name = "Dullahan"
+
+/datum/robot_sprite/dogborg/tall/science/dullahan
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_sci.dmi'
+	pixel_x = 0
+
+/datum/robot_sprite/dogborg/tall/science/dullahan/sci
+	name = "Dullahan"
 	sprite_icon_state = "dullahansci"
 	sprite_hud_icon_state = "sci-borg"
 	has_vore_belly_sprites = TRUE
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
-	pixel_x = 0
 
-/datum/robot_sprite/dogborg/tall/science/dullahansciencealt
+/datum/robot_sprite/dogborg/tall/science/dullahan/scialt
 	name = "Dullahan v2"
-	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_sci.dmi'
 	sprite_icon_state = "dullahansci_alt"
 	sprite_hud_icon_state = "sci-borg"
 	has_vore_belly_sprites = TRUE
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
-	pixel_x = 0
 
-/datum/robot_sprite/dogborg/science/smolraptorsciencesprite
+/datum/robot_sprite/dogborg/science/smolraptor
 	sprite_icon = 'modular_chomp/icons/mob/smallraptors/smolraptor_sci.dmi'
-	pixel_x = 0
 
 
-/datum/robot_sprite/dogborg/science/smolraptorsciencesprite/smolraptorsci
+/datum/robot_sprite/dogborg/science/smolraptor/sci
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -16,38 +16,35 @@
 	has_laser_sprite = FALSE //Missing from the dmi
 	has_taser_sprite = FALSE //ditto
 
-/datum/robot_sprite/dogborg/tall/security/dullahansecurity
-	name = "Dullahan"
+
+/datum/robot_sprite/dogborg/tall/security/dullahan
 	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_sec.dmi'
+	pixel_x = 0
+
+/datum/robot_sprite/dogborg/tall/security/dullahan/sec
+	name = "Dullahan"
 	sprite_icon_state = "dullahansec"
 	sprite_hud_icon_state = "k9"
 	has_laser_sprite = FALSE //Missing from the dmi
 	has_taser_sprite = FALSE //ditto
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
-	pixel_x = 0
 
-/datum/robot_sprite/dogborg/tall/security/dullahansecurityalt
+/datum/robot_sprite/dogborg/tall/security/dullahan/secalt
 	name = "Dullahan v2"
-	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_sec.dmi'
 	sprite_icon_state = "dullahansec_alt"
 	sprite_hud_icon_state = "k9"
 	has_laser_sprite = FALSE //Missing from the dmi
 	has_taser_sprite = FALSE //ditto
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = TRUE
 	has_vore_belly_sprites = TRUE
-	pixel_x = 0
 
-
-/datum/robot_sprite/dogborg/security/smolraptorsecuritysprite
+/datum/robot_sprite/dogborg/security/smolraptor
 	sprite_icon = 'modular_chomp/icons/mob/smallraptors/smolraptor_pk.dmi'
 
-/datum/robot_sprite/dogborg/security/smolraptorsecuritysprite/smolraptorsec
+/datum/robot_sprite/dogborg/security/smolraptor/sec
 	name = "Small Raptor"
 	sprite_icon_state = "smolraptor"
 	has_eye_light_sprites = TRUE
-	has_custom_open_sprites = FALSE
 	has_vore_belly_sprites = TRUE
 	rest_sprite_options = list("Default", "Sit")

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

@@ -0,0 +1,9 @@
+
+/datum/robot_sprite/dogborg/tall/combat_medic/dullahancombatmedic
+	name = "Dullahan Combat Medic"
+	sprite_icon = 'modular_chomp/icons/mob/dullahanborg/dullahan_syndie.dmi'
+	sprite_icon_state = "dullahansyndi"
+	has_eye_light_sprites = TRUE
+	has_vore_belly_sprites = TRUE
+	rest_sprite_options = list("Default", "Sit")
+	pixel_x = 0