From f224fb8187c6e998b99a6ba3ec76a9cc97fdc233 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 1 Dec 2023 21:49:10 +0100 Subject: [PATCH] Medical & Mining borg naming cleanup (#7292) --- .../living/silicon/robot/sprites/civilian.dm | 8 -- .../living/silicon/robot/sprites/medical.dm | 10 +-- .../living/silicon/robot/sprites/civilian.dm | 8 ++ .../living/silicon/robot/sprites/medical.dm | 75 ++++++++++++++++--- .../living/silicon/robot/sprites/mining.dm | 25 +------ 5 files changed, 76 insertions(+), 50 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index 7c61dab7a5..16284a039c 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -167,14 +167,6 @@ sprite_icon_state = "zoomba" has_dead_sprite = TRUE -/datum/robot_sprite/service/worm //CHOMPAdd Start - name = "W02M" - sprite_icon_state = "worm-service" - has_custom_open_sprites = TRUE - sprite_icon = 'modular_chomp/icons/mob/wormborg.dmi' - has_vore_belly_sprites = TRUE - has_dead_sprite = TRUE //CHOMPAdd End - // Wide/dogborg sprites /datum/robot_sprite/dogborg/service diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm index 6205414148..490d012041 100644 --- a/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -74,7 +74,7 @@ has_custom_open_sprites = TRUE /datum/robot_sprite/medical/worm - name = "W02M" + name = "W02M - Surgical" //CHOMPEdit sprite_icon_state = "worm-crisis" //CHOMPEdit has_custom_open_sprites = TRUE sprite_icon = 'modular_chomp/icons/mob/wormborg.dmi' //CHOMPEdit @@ -188,14 +188,6 @@ name = "Feminine Humanoid" sprite_icon_state = "uptall" -/datum/robot_sprite/surgical/worm //CHOMPAdd Start - name = "W02M" - sprite_icon_state = "worm-surgeon" - has_custom_open_sprites = TRUE - sprite_icon = 'modular_chomp/icons/mob/wormborg.dmi' - has_vore_belly_sprites = TRUE - has_dead_sprite = TRUE //CHOMPAdd End - // Wide/dogborg sprites /datum/robot_sprite/dogborg/surgical diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm index 4227143d65..1eb70a68e8 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -12,6 +12,14 @@ has_vore_belly_resting_sprites = TRUE has_eye_light_sprites = TRUE +/datum/robot_sprite/service/worm + name = "W02M" + sprite_icon_state = "worm-service" + has_custom_open_sprites = TRUE + sprite_icon = 'modular_chomp/icons/mob/wormborg.dmi' + has_vore_belly_sprites = TRUE + has_dead_sprite = TRUE + /*Upstream implemented /datum/robot_sprite/dogborg/tall/service sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm index e94334cb61..bbfa7239c6 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -37,11 +37,9 @@ //Medical into Crisis type merge /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 @@ -49,18 +47,69 @@ module_type = "Crisis" sprite_icon = 'icons/mob/robot/surgical_large.dmi' -// Tall prite overwrites +//sprite name overwrites +/datum/robot_sprite/surgical/toiletbot + name = "Telemachus - Surgical" + +/datum/robot_sprite/surgical/sleek + name = "WTOperator - Surgical" + +/datum/robot_sprite/surgical/drone + name = "AG Model - Surgical" + +/datum/robot_sprite/surgical/glitterfly + name = "Pyralis - Surgical" + +/datum/robot_sprite/surgical/decapod + name = "Decapod - Surgical" + +/datum/robot_sprite/surgical/pneuma + name = "Pneum - Surgical" + +/datum/robot_sprite/surgical/zoomba + name = "ZOOM-BA - Surgical" + +/datum/robot_sprite/surgical/uptall + name = "Feminine Humanoid - Surgical" + +/datum/robot_sprite/dogborg/surgical/borgi + name = "Borgi - Surgical" + +/datum/robot_sprite/dogborg/surgical/drake + name = "Drake - Surgical" + /datum/robot_sprite/dogborg/tall/surgical/raptor name = "Raptor V-4 - Surgical" - sprite_icon_state = "raptor" - has_custom_equipment_sprites = TRUE - rest_sprite_options = list("Default", "Bellyup") + +/datum/robot_sprite/crisis/toiletbot + name = "Telemachus - Crisis" + +/datum/robot_sprite/crisis/sleek + name = "WTOperator - Crisis" + +/datum/robot_sprite/crisis/glitterfly + name = "Pyralis - Crisis" + +/datum/robot_sprite/crisis/decapod + name = "Decapod - Crisis" + +/datum/robot_sprite/crisis/pneuma + name = "Pneuma - Crisis" + +/datum/robot_sprite/crisis/zoomba + name = "ZOOM-BA - Crisis" + +/datum/robot_sprite/crisis/uptall + name = "Feminine Humanoid - Crisis" + +/datum/robot_sprite/dogborg/crisis/borgi + name = "Borgi - Crisis" + +/datum/robot_sprite/dogborg/crisis/drake + name = "Drake - Crisis" /datum/robot_sprite/dogborg/tall/crisis/raptor name = "Raptor V-4 - Crisis" - sprite_icon_state = "raptor" - has_custom_equipment_sprites = TRUE - rest_sprite_options = list("Default", "Bellyup") //Added sprites /datum/robot_sprite/dogborg/crisis/vale2 @@ -78,3 +127,11 @@ has_vore_belly_resting_sprites = TRUE has_eye_light_sprites = TRUE has_sleeper_light_indicator = TRUE + +/datum/robot_sprite/surgical/worm + name = "W02M - Surgical" + sprite_icon_state = "worm-surgeon" + has_custom_open_sprites = TRUE + sprite_icon = 'modular_chomp/icons/mob/wormborg.dmi' + has_vore_belly_sprites = TRUE + has_dead_sprite = TRUE diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm index e72cde4136..0cd9d135fb 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm @@ -27,44 +27,21 @@ rest_sprite_options = list("Default", "Bellyup") */ -//redefining the upstream modules, using the proper sprites from there to use another name. +//sprite name overwrites /datum/robot_sprite/dogborg/tall/mining/meka name = "MEKA - Mining" - sprite_icon_state = "meka" - 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/mmeka name = "NIKO - Mining" - 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 = "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 = "k4t" - 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_alt1 name = "K4Talt - Mining" - 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") //Upstream does not have those, if we want them, we should add them on top now /datum/robot_sprite/dogborg/tall/mining/ch