From 68ac0a687bb424732bfca89c1b9cf43b16d79307 Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Tue, 11 Mar 2025 16:10:55 -0400 Subject: [PATCH] dullahan pixel adjustment (#17313) whoops, this got missed --- code/modules/mob/living/silicon/robot/sprites/civilian.dm | 3 --- code/modules/mob/living/silicon/robot/sprites/combat.dm | 1 - code/modules/mob/living/silicon/robot/sprites/engineering.dm | 1 - code/modules/mob/living/silicon/robot/sprites/janitor.dm | 1 - code/modules/mob/living/silicon/robot/sprites/medical.dm | 1 - code/modules/mob/living/silicon/robot/sprites/mining.dm | 2 -- code/modules/mob/living/silicon/robot/sprites/science.dm | 2 +- code/modules/mob/living/silicon/robot/sprites/security.dm | 2 +- code/modules/mob/living/silicon/robot/sprites/syndicate.dm | 2 +- .../silicon/robot/subtypes/exploration/exploration-sprites.dm | 1 - 10 files changed, 3 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index b5863e8e2b3..98e03ad588f 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -320,7 +320,6 @@ rest_sprite_options = list("Default", "Sit") has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - pixel_x = 0 /datum/robot_sprite/dogborg/tall/service/dullahan/servicealt name = "Dullahan v2" @@ -443,7 +442,6 @@ has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE rest_sprite_options = list("Default", "Sit") - pixel_x = 0 /datum/robot_sprite/dogborg/clown/stoat name = "ST-04t" @@ -472,7 +470,6 @@ /datum/robot_sprite/dogborg/tall/service/mekaserve_alt sprite_icon = 'icons/mob/robot/tallrobot/tallrobots.dmi' name = "MEKA Alt" - pixel_x = 0 sprite_icon_state = "mekaserve_alt" rest_sprite_options = list("Default", "Sit") diff --git a/code/modules/mob/living/silicon/robot/sprites/combat.dm b/code/modules/mob/living/silicon/robot/sprites/combat.dm index 1cce8818271..88c12127e68 100644 --- a/code/modules/mob/living/silicon/robot/sprites/combat.dm +++ b/code/modules/mob/living/silicon/robot/sprites/combat.dm @@ -160,7 +160,6 @@ module_type = "Combat" sprite_icon = 'icons/mob/robot/tallrobot/tallrobots.dmi' has_vore_belly_sprites = TRUE - pixel_x = 0 /datum/robot_sprite/dogborg/tall/combat/tall/mmeka name = "NIKO" diff --git a/code/modules/mob/living/silicon/robot/sprites/engineering.dm b/code/modules/mob/living/silicon/robot/sprites/engineering.dm index c09910ca99e..a9ecdd93d31 100644 --- a/code/modules/mob/living/silicon/robot/sprites/engineering.dm +++ b/code/modules/mob/living/silicon/robot/sprites/engineering.dm @@ -227,7 +227,6 @@ rest_sprite_options = list("Default", "Sit") has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - pixel_x = 0 /datum/robot_sprite/dogborg/tall/engineering/dullahan/engineerv2 name = "Dullahan v2" diff --git a/code/modules/mob/living/silicon/robot/sprites/janitor.dm b/code/modules/mob/living/silicon/robot/sprites/janitor.dm index cadab897a96..9a4fc4750c0 100644 --- a/code/modules/mob/living/silicon/robot/sprites/janitor.dm +++ b/code/modules/mob/living/silicon/robot/sprites/janitor.dm @@ -212,7 +212,6 @@ has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE rest_sprite_options = list("Default", "Sit") - pixel_x = 0 /datum/robot_sprite/dogborg/tall/janitor/dullahan/janitoralt name = "Dullahan v2" diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm index 4aa41be9955..dfe5e7652b9 100644 --- a/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -149,7 +149,6 @@ has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE rest_sprite_options = list("Default", "Sit") - pixel_x = 0 /datum/robot_sprite/dogborg/tall/crisis/dullahan/crisisalt name = "Dullahan v2" diff --git a/code/modules/mob/living/silicon/robot/sprites/mining.dm b/code/modules/mob/living/silicon/robot/sprites/mining.dm index 11080709504..e59093eb306 100644 --- a/code/modules/mob/living/silicon/robot/sprites/mining.dm +++ b/code/modules/mob/living/silicon/robot/sprites/mining.dm @@ -196,7 +196,6 @@ has_custom_open_sprites = FALSE has_eye_light_sprites = TRUE rest_sprite_options = list("Default", "sit") - pixel_x = 0 /datum/robot_sprite/dogborg/tall/mining/dullahan/mineralt name = "Dullahan Mining unit v2" @@ -215,7 +214,6 @@ has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE rest_sprite_options = list("Default", "Sit") - pixel_x = 0 /datum/robot_sprite/dogborg/tall/mining/dullahancarg/cargoalt name = "Dullahan Cargo v2" diff --git a/code/modules/mob/living/silicon/robot/sprites/science.dm b/code/modules/mob/living/silicon/robot/sprites/science.dm index 3e4db117e1d..dfb35aabeb6 100644 --- a/code/modules/mob/living/silicon/robot/sprites/science.dm +++ b/code/modules/mob/living/silicon/robot/sprites/science.dm @@ -220,7 +220,7 @@ has_eye_light_sprites = TRUE sprite_hud_icon_state = "sci-borg" rest_sprite_options = list("Default", "Sit") - pixel_x = 0 + /datum/robot_sprite/dogborg/tall/science/dullahan/scialt name = "Dullahan v2" diff --git a/code/modules/mob/living/silicon/robot/sprites/security.dm b/code/modules/mob/living/silicon/robot/sprites/security.dm index 4ff575b9139..279eb45955f 100644 --- a/code/modules/mob/living/silicon/robot/sprites/security.dm +++ b/code/modules/mob/living/silicon/robot/sprites/security.dm @@ -220,7 +220,7 @@ name = "Dullahan" sprite_icon_state = "dullahansec" sprite_icon = 'icons/mob/robot/dullahan/v1/dullahan_sec.dmi' - pixel_x = 0 + sprite_hud_icon_state = "k9" has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE diff --git a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm index d03546d7a69..c19a25fd13c 100644 --- a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm @@ -76,7 +76,6 @@ has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE rest_sprite_options = list("Default", "Sit") - pixel_x = 0 /datum/robot_sprite/dogborg/tall/syndie/dullahanv3syndi sprite_icon = 'icons/mob/robot/dullahan/v3/syndi.dmi' @@ -88,6 +87,7 @@ sprite_decals = list("decals") rest_sprite_options = list("Default", "Sit") + // Protector // Regular sprites diff --git a/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm b/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm index 4369a385484..a83354316c4 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/exploration/exploration-sprites.dm @@ -16,7 +16,6 @@ /datum/robot_sprite/dogborg/tall/explorer/dullahan module_type = "Exploration" sprite_icon = 'icons/mob/robot/dullahan/v1/dullahan_explorer.dmi' - pixel_x = 0 /datum/robot_sprite/dogborg/tall/explorer/dullahan/explorer name = "Dullahan"