diff --git a/code/modules/mob/living/silicon/robot/sprites/catborgs.dm b/code/modules/mob/living/silicon/robot/sprites/catborgs.dm index 9a07ca6851..3ffd0bd2e5 100644 --- a/code/modules/mob/living/silicon/robot/sprites/catborgs.dm +++ b/code/modules/mob/living/silicon/robot/sprites/catborgs.dm @@ -241,6 +241,20 @@ sprite_flags = ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_TASER_SPRITE | ROBOT_HAS_LASER_SPRITE module_type = list("Service", "Clerical", "Janitor") //They get Janitor because no specific janitor sprite. +/datum/robot_sprite/dogborg/combat_medic/catborg + name = "Catborg" + sprite_icon_state = "syndicat" + sprite_hud_icon_state = "syndicat" + has_eye_sprites = TRUE + has_eye_light_sprites = TRUE + has_sleeper_light_indicator = FALSE + has_vore_belly_resting_sprites = TRUE + sprite_icon = 'icons/mob/robot/catborgs/departmental/large/catborg_combatmed.dmi' + rest_sprite_options = list("Default", "Bellyup", "Sit") + belly_capacity_list = list("sleeper" = 2, "throat" =2) + belly_light_list = list("sleeper" = 2) + sprite_flags = ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_DISABLER_SPRITE | ROBOT_HAS_TASER_SPRITE | ROBOT_HAS_LASER_SPRITE + /// CUSTOM /// Custom Catborg set up like a gryphon. diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index 8d03c22312..b5863e8e2b 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -436,7 +436,7 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Bellyup") -/datum/robot_sprite/dogborg/tall/clown/dullahan/clown +/datum/robot_sprite/dogborg/tall/clown/dullahan name = "Dullahan Clown" sprite_icon = 'icons/mob/robot/dullahan/v1/dullahan_clown.dmi' sprite_icon_state = "dullahanclown" @@ -452,6 +452,7 @@ has_eye_light_sprites = TRUE has_vore_belly_resting_sprites = TRUE has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default") /datum/robot_sprite/dogborg/service/valech name = "ServicehoundV2 - Alt" diff --git a/code/modules/mob/living/silicon/robot/sprites/event.dm b/code/modules/mob/living/silicon/robot/sprites/event.dm index 42bc06dcdc..9e5755b26d 100644 --- a/code/modules/mob/living/silicon/robot/sprites/event.dm +++ b/code/modules/mob/living/silicon/robot/sprites/event.dm @@ -49,6 +49,7 @@ name = "Raptor V-4" sprite_icon_state = "raptor" sprite_flags = ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_LASER_SPRITE + rest_sprite_options = list("Default", "Bellyup") // Gravekeeper @@ -82,3 +83,4 @@ name = "Raptor V-4" sprite_icon_state = "raptor" sprite_flags = ROBOT_HAS_SHIELD_SPRITE | ROBOT_HAS_LASER_SPRITE + rest_sprite_options = list("Default", "Bellyup") diff --git a/code/modules/mob/living/silicon/robot/sprites/fluff.dm b/code/modules/mob/living/silicon/robot/sprites/fluff.dm index c97676b204..9f3093913e 100644 --- a/code/modules/mob/living/silicon/robot/sprites/fluff.dm +++ b/code/modules/mob/living/silicon/robot/sprites/fluff.dm @@ -16,6 +16,7 @@ has_vore_belly_sprites = TRUE has_rest_sprites = TRUE rest_sprite_options = list("Default", "Sit", "Bellyup") + sprite_icon_state = "argonne-russ-sec" //This is overwritten. This borg should never be seen as it's just a parent for the actual subtypes. has_dead_sprite = TRUE has_dead_sprite_overlay = TRUE pixel_x = -16 diff --git a/code/modules/mob/living/silicon/robot/sprites/janitor.dm b/code/modules/mob/living/silicon/robot/sprites/janitor.dm index 524c450c4f..cadab897a9 100644 --- a/code/modules/mob/living/silicon/robot/sprites/janitor.dm +++ b/code/modules/mob/living/silicon/robot/sprites/janitor.dm @@ -249,3 +249,4 @@ //has_vore_belly_resting_sprites = TRUE has_eye_light_sprites = TRUE has_dead_sprite_overlay = FALSE + rest_sprite_options = list("Default") diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm index a5eca73dc8..21b2c90573 100644 --- a/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -160,6 +160,7 @@ sprite_decals = list("decals") sprite_icon = 'icons/mob/robot/dullahan/v3/medical.dmi' sprite_icon_state = "dullahanmedical" + rest_sprite_options = list("Default", "Sit") // Surgeon @@ -433,6 +434,7 @@ sprite_hud_icon_state = "medihound" has_eye_light_sprites = TRUE has_sleeper_light_indicator = TRUE + rest_sprite_options = list("Default") /datum/robot_sprite/dogborg/crisis/cat name = "Cat" diff --git a/code/modules/mob/living/silicon/robot/sprites/science.dm b/code/modules/mob/living/silicon/robot/sprites/science.dm index b479434001..1f288a19a1 100644 --- a/code/modules/mob/living/silicon/robot/sprites/science.dm +++ b/code/modules/mob/living/silicon/robot/sprites/science.dm @@ -218,6 +218,7 @@ has_vore_belly_sprites = TRUE 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 @@ -228,7 +229,6 @@ name = "Dullahan v3" sprite_icon = 'icons/mob/robot/dullahan/v3/science.dmi' sprite_icon_state = "dullahanscience" - rest_sprite_options = list("Default", "sit") sprite_decals = list("decals") /datum/robot_sprite/dogborg/science/cat diff --git a/code/modules/mob/living/silicon/robot/sprites/security.dm b/code/modules/mob/living/silicon/robot/sprites/security.dm index 83c025c17f..0c80514391 100644 --- a/code/modules/mob/living/silicon/robot/sprites/security.dm +++ b/code/modules/mob/living/silicon/robot/sprites/security.dm @@ -225,7 +225,7 @@ sprite_hud_icon_state = "k9" has_eye_light_sprites = TRUE has_vore_belly_sprites = TRUE - rest_sprite_options = list("Default", "sit") + rest_sprite_options = list("Default", "Sit") /datum/robot_sprite/dogborg/tall/security/dullahan/secalt name = "Dullahan v2" @@ -244,6 +244,7 @@ sprite_icon_state = "secvale" sprite_hud_icon_state = "k9" has_eye_light_sprites = TRUE + rest_sprite_options = list("Default") /datum/robot_sprite/dogborg/security/cat name = "Cat" diff --git a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm index b3c3072db8..d03546d7a6 100644 --- a/code/modules/mob/living/silicon/robot/sprites/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/sprites/syndicate.dm @@ -86,7 +86,7 @@ has_custom_open_sprites = TRUE has_vore_belly_sprites = TRUE sprite_decals = list("decals") - rest_sprite_options = list("Default", "sit") + rest_sprite_options = list("Default", "Sit") // Protector @@ -184,7 +184,7 @@ has_custom_open_sprites = TRUE has_vore_belly_sprites = TRUE sprite_decals = list("decals") - rest_sprite_options = list("Default", "sit") + rest_sprite_options = list("Default", "Sit") /datum/robot_sprite/dogborg/tall/mechanist/syndimechraptor name = "Raptor V-4" diff --git a/code/unit_tests/robot_tests.dm b/code/unit_tests/robot_tests.dm index 547aada5a0..677ad8e8d7 100644 --- a/code/unit_tests/robot_tests.dm +++ b/code/unit_tests/robot_tests.dm @@ -56,7 +56,7 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-sleeper-r-[rest_style]")) failed = TRUE @@ -71,7 +71,7 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-sleeper-r-[rest_style]-struggle")) failed = TRUE @@ -84,7 +84,7 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-sleeper-[rest_style]")) failed = TRUE @@ -95,7 +95,7 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-sleeper-[rest_style]-struggle")) failed = TRUE @@ -108,7 +108,7 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-[belly]-[num]-[rest_style]")) failed = TRUE @@ -119,7 +119,7 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-[belly]-[num]-[rest_style]-struggle")) failed = TRUE @@ -134,7 +134,7 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-[belly]-[num]-r-[rest_style]")) failed = TRUE @@ -149,21 +149,18 @@ if(RS.has_vore_belly_resting_sprites) for(var/rest_style in RS.rest_sprite_options) rest_style = lowertext(rest_style) - if(rest_style == "Default") + if(rest_style == "default") rest_style = "rest" if(check_state(RS,"-[belly]-[num]-r-[rest_style]-struggle")) failed = TRUE if(check_state(RS,"-[belly]-[num]-g-[rest_style]-struggle")) failed = TRUE // reseting - if(RS.rest_sprite_options in list("Sit")) - if(check_state(RS,"-sit")) - failed = TRUE - if(RS.rest_sprite_options in list("Default")) - if(check_state(RS,"-rest")) - failed = TRUE - if(RS.rest_sprite_options in list("Bellyup")) - if(check_state(RS,"-bellyup")) + for(var/rest_style in RS.rest_sprite_options) + rest_style = lowertext(rest_style) + if(rest_style == "default") + rest_style = "rest" + if(check_state(RS,"-[rest_style]")) failed = TRUE // death if(RS.has_dead_sprite) diff --git a/icons/mob/robot/catborgs/custom/catborg_cameron.dmi b/icons/mob/robot/catborgs/custom/catborg_cameron.dmi index f2c32e3680..ed850300a0 100644 Binary files a/icons/mob/robot/catborgs/custom/catborg_cameron.dmi and b/icons/mob/robot/catborgs/custom/catborg_cameron.dmi differ diff --git a/icons/mob/robot/catborgs/custom/catborg_matica_custom.dmi b/icons/mob/robot/catborgs/custom/catborg_matica_custom.dmi index 71bb525de6..96740d64bd 100644 Binary files a/icons/mob/robot/catborgs/custom/catborg_matica_custom.dmi and b/icons/mob/robot/catborgs/custom/catborg_matica_custom.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/large/catborg_cargo.dmi b/icons/mob/robot/catborgs/departmental/large/catborg_cargo.dmi index 58b825edc4..10f0a59c3f 100644 Binary files a/icons/mob/robot/catborgs/departmental/large/catborg_cargo.dmi and b/icons/mob/robot/catborgs/departmental/large/catborg_cargo.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/large/catborg_combatmed.dmi b/icons/mob/robot/catborgs/departmental/large/catborg_combatmed.dmi new file mode 100644 index 0000000000..62b5be0307 Binary files /dev/null and b/icons/mob/robot/catborgs/departmental/large/catborg_combatmed.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/large/catborg_engineering.dmi b/icons/mob/robot/catborgs/departmental/large/catborg_engineering.dmi index a604f8df48..bc40777b37 100644 Binary files a/icons/mob/robot/catborgs/departmental/large/catborg_engineering.dmi and b/icons/mob/robot/catborgs/departmental/large/catborg_engineering.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/large/catborg_medical.dmi b/icons/mob/robot/catborgs/departmental/large/catborg_medical.dmi index 4c5997d3e3..3e4072cc20 100644 Binary files a/icons/mob/robot/catborgs/departmental/large/catborg_medical.dmi and b/icons/mob/robot/catborgs/departmental/large/catborg_medical.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/large/catborg_science.dmi b/icons/mob/robot/catborgs/departmental/large/catborg_science.dmi index a640883989..1f2e45b526 100644 Binary files a/icons/mob/robot/catborgs/departmental/large/catborg_science.dmi and b/icons/mob/robot/catborgs/departmental/large/catborg_science.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/large/catborg_security.dmi b/icons/mob/robot/catborgs/departmental/large/catborg_security.dmi index 4d2847362b..a8af1cb65c 100644 Binary files a/icons/mob/robot/catborgs/departmental/large/catborg_security.dmi and b/icons/mob/robot/catborgs/departmental/large/catborg_security.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/large/catborg_service.dmi b/icons/mob/robot/catborgs/departmental/large/catborg_service.dmi index 7ae0ab3baf..d4f1d47fca 100644 Binary files a/icons/mob/robot/catborgs/departmental/large/catborg_service.dmi and b/icons/mob/robot/catborgs/departmental/large/catborg_service.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/small/kittyborg_cargo.dmi b/icons/mob/robot/catborgs/departmental/small/kittyborg_cargo.dmi index 5bdfe729bc..ac0f57a7d3 100644 Binary files a/icons/mob/robot/catborgs/departmental/small/kittyborg_cargo.dmi and b/icons/mob/robot/catborgs/departmental/small/kittyborg_cargo.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/small/kittyborg_engi.dmi b/icons/mob/robot/catborgs/departmental/small/kittyborg_engi.dmi index 20c3eb603c..c96d662ede 100644 Binary files a/icons/mob/robot/catborgs/departmental/small/kittyborg_engi.dmi and b/icons/mob/robot/catborgs/departmental/small/kittyborg_engi.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/small/kittyborg_jani.dmi b/icons/mob/robot/catborgs/departmental/small/kittyborg_jani.dmi index 72a2fae93a..cbdbd0f672 100644 Binary files a/icons/mob/robot/catborgs/departmental/small/kittyborg_jani.dmi and b/icons/mob/robot/catborgs/departmental/small/kittyborg_jani.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/small/kittyborg_medicat.dmi b/icons/mob/robot/catborgs/departmental/small/kittyborg_medicat.dmi index 2667bab280..86df3b6e58 100644 Binary files a/icons/mob/robot/catborgs/departmental/small/kittyborg_medicat.dmi and b/icons/mob/robot/catborgs/departmental/small/kittyborg_medicat.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/small/kittyborg_sci.dmi b/icons/mob/robot/catborgs/departmental/small/kittyborg_sci.dmi index 0f24ea8f46..9f57e0873c 100644 Binary files a/icons/mob/robot/catborgs/departmental/small/kittyborg_sci.dmi and b/icons/mob/robot/catborgs/departmental/small/kittyborg_sci.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/small/kittyborg_sec.dmi b/icons/mob/robot/catborgs/departmental/small/kittyborg_sec.dmi index 134fe7d1f3..d49afd8336 100644 Binary files a/icons/mob/robot/catborgs/departmental/small/kittyborg_sec.dmi and b/icons/mob/robot/catborgs/departmental/small/kittyborg_sec.dmi differ diff --git a/icons/mob/robot/catborgs/departmental/small/kittyborg_service.dmi b/icons/mob/robot/catborgs/departmental/small/kittyborg_service.dmi index 5a91ef599f..81feda3643 100644 Binary files a/icons/mob/robot/catborgs/departmental/small/kittyborg_service.dmi and b/icons/mob/robot/catborgs/departmental/small/kittyborg_service.dmi differ diff --git a/icons/mob/robot/dullahan/v1/dullahan_clown.dmi b/icons/mob/robot/dullahan/v1/dullahan_clown.dmi index f80dede30f..ba3a467fb1 100644 Binary files a/icons/mob/robot/dullahan/v1/dullahan_clown.dmi and b/icons/mob/robot/dullahan/v1/dullahan_clown.dmi differ diff --git a/icons/mob/robot/dullahan/v1/dullahan_syndie.dmi b/icons/mob/robot/dullahan/v1/dullahan_syndie.dmi index 08f7d70acc..def31090c5 100644 Binary files a/icons/mob/robot/dullahan/v1/dullahan_syndie.dmi and b/icons/mob/robot/dullahan/v1/dullahan_syndie.dmi differ diff --git a/icons/mob/robot/fluff_wide.dmi b/icons/mob/robot/fluff_wide.dmi index 2657179a5c..761e058a14 100644 Binary files a/icons/mob/robot/fluff_wide.dmi and b/icons/mob/robot/fluff_wide.dmi differ