Merge branch 'master' into upstream-24-08b

modular_zubbers/code/modules/borgs/code/robot_defines.dm

@@ -4,6 +4,7 @@
 #define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/largerobot_cc.dmi'
 
 #define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_clown.dmi'
+#define CYBORG_ICON_CLOWN_TALL_BUBBER 'modular_zubbers/code/modules/borgs/sprites/tallrobot_clown.dmi'
 
 #define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/code/modules/borgs/sprites/widerobot_med.dmi'
 #define CYBORG_ICON_MED_TALL_BUBBER 'modular_zubbers/code/modules/borgs/sprites/tallrobot_med.dmi'

modular_zubbers/code/modules/borgs/code/robot_model.dm

@@ -285,6 +285,12 @@
 			SKIN_ICON = CYBORG_ICON_CLOWN_WIDE_BUBBER,
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE),
 		),
+		"Dullahan" = list(
+			SKIN_ICON_STATE = "dullahanclown",
+			SKIN_ICON = CYBORG_ICON_CLOWN_TALL_BUBBER,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL),
+			DULLAHAN_HAT_OFFSET
+		),
 	)
 
 /obj/item/robot_model/standard/Initialize(mapload)