diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 69957fd54fe..b078db9a7e3 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -251,7 +251,6 @@ log_silicon("CYBORG: [key_name(cyborg)] has transformed into the [new_model] model.") //SKYRAT EDIT ADDITION BEGIN - ALTBORGS - Old check for 'dogborg' var no longer necessary, refactored into model_features instead. - //new_model.update_dogborg() // BUBBER REMOVAL new_model.update_tallborg() //SKYRAT EDIT ADDITION END //BUBBER EDIT ADDTION BEGIN diff --git a/modular_skyrat/modules/borgs/code/robot_model.dm b/modular_skyrat/modules/borgs/code/robot_model.dm index 8ef0cc21999..daf1a8f5b80 100644 --- a/modular_skyrat/modules/borgs/code/robot_model.dm +++ b/modular_skyrat/modules/borgs/code/robot_model.dm @@ -25,6 +25,9 @@ qdel(cyborg.GetComponent(/datum/component/robot_smoke)) QDEL_NULL(cyborg.particles) // Removing left over particles + +// TODO: MOVE HAT OFFSET DEFINES TO BUBBER MODULAR ROBOT_DEFINES! + #define TALL_HAT_OFFSET \ SKIN_HAT_OFFSET = list("north" = list(0, 15), "south" = list(0, 15), "east" = list(2, 15), "west" = list(-2, 15)), \ SKIN_HAT_REST_OFFSET = list("north" = list(0, 1), "south" = list(0, 1), "east" = list(2, 1), "west" = list(-2, 1)) diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm index 30907fd4f30..f3227c86592 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm @@ -1,67 +1,100 @@ // Bubberstation custom borg sprites, add new defines in line with code\__DEFINES\~skyrat_defines\robot_defines.dm format +/************************************************************ + CYBORG ICON DEFINES AND TYPES GO BELOW +*************************************************************/ + +//CENTCOM BORG ICON DEFINES #define CYBORG_ICON_CENTCOM_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cc.dmi' #define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cc.dmi' + +//CLOWN BORG ICON DEFINES #define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_clown.dmi' #define CYBORG_ICON_CLOWN_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_clown.dmi' + +//MEDICAL BORG ICON DEFINES #define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_med.dmi' #define CYBORG_ICON_MED_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_med.dmi' #define CYBORG_ICON_MED_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_med.dmi' #define CYBORG_ICON_MED_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_med.dmi' + +//CARGO BORG ICON DEFINES #define CYBORG_ICON_CARGO_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cargo.dmi' #define CYBORG_ICON_CARGO_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_cargo.dmi' #define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cargo.dmi' + +//SECURITY BORG ICON DEFINES #define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sec.dmi' #define CYBORG_ICON_SEC_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sec.dmi' #define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sec.dmi' + +//ENGI BORG ICON DEFINES #define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_eng.dmi' #define CYBORG_ICON_ENG_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_eng.dmi' #define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_eng.dmi' #define CYBORG_ICON_ENG_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_eng.dmi' + +//PEACEKEEPER BORG ICON DEFINES #define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_pk.dmi' #define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_pk.dmi' #define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_pk.dmi' #define CYBORG_ICON_PEACEKEEPER_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_pk.dmi' + +//SERVICE BORG ICON DEFINES #define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_serv.dmi' #define CYBORG_ICON_SERVICE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_serv.dmi' #define CYBORG_ICON_SERVICE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_serv.dmi' #define CYBORG_ICON_SERVICE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_serv.dmi' #define CYBORG_ICON_SERVICE_BUNDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_bun.dmi' + +//MINING BORG ICON DEFINES #define CYBORG_ICON_MINING_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_mine.dmi' #define CYBORG_ICON_MINING_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_mine.dmi' #define CYBORG_ICON_MINING_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_mine.dmi' #define CYBORG_ICON_MINING_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_mine.dmi' + +//JANI BORG ICON DEFINES #define CYBORG_ICON_JANI_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_jani.dmi' #define CYBORG_ICON_JANI_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_jani.dmi' #define CYBORG_ICON_JANI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_jani.dmi' #define CYBORG_ICON_JANI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_jani.dmi' + +//SYNDICATE BORG ICON DEFINES #define CYBORG_ICON_SYNDIE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_syndie.dmi' #define CYBORG_ICON_SYNDIE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_syndie.dmi' #define CYBORG_ICON_SYNDIE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_syndie.dmi' #define CYBORG_ICON_SYNDIE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_syndie.dmi' + +//NINJA BORG ICON DEFINES #define CYBORG_ICON_NINJA_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_ninja.dmi' #define CYBORG_ICON_NINJA_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_ninja.dmi' #define CYBORG_ICON_NINJA_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_ninja.dmi' -#define CYBORG_ICON_TYPE_RAPTOR "raptor" +//SCIENCE BORG ICON DEFINES #define CYBORG_ICON_SCI_WIDE 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sci.dmi' #define CYBORG_ICON_SCI_TALL 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sci.dmi' #define CYBORG_ICON_SCI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sci.dmi' #define CYBORG_ICON_SCI 'modular_zubbers/code/modules/silicons/borgs/sprites/robot_sci.dmi' #define CYBORG_ICON_SCI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_sci.dmi' +// RAPTOR BORG ICON TYPE DEFINE +#define CYBORG_ICON_TYPE_RAPTOR "raptor" + + +// SMOLRAPTOR BORG DEFINES BELOW + #define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor" #define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_gen.dmi' @@ -75,21 +108,43 @@ #define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi' #define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi' -//F3-LINE cyborgs -#define CYBORG_ICON_ALL_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi' -#define CYBORG_ICON_TYPE_GEN_CATBORG "FELI-Standard" -#define CYBORG_ICON_TYPE_SCI_CATBORG "FELI-Research" -#define CYBORG_ICON_TYPE_ENG_CATBORG "FELI-Engineer" -#define CYBORG_ICON_TYPE_MED_CATBORG "FELI-Medical" -#define CYBORG_ICON_TYPE_CAR_CATBORG "FELI-Cargo" -#define CYBORG_ICON_TYPE_SERV_CATBORG "FELI-Service" -#define CYBORG_ICON_TYPE_PK_CATBORG "FELI-Pk" -#define CYBORG_ICON_TYPE_JANI_CATBORG "FELI-Janitor" -#define CYBORG_ICON_TYPE_MINE_CATBORG "FELI-Mining" -#define CYBORG_ICON_TYPE_SEC_CATBORG "FELI-Security" -#define CYBORG_ICON_TYPE_SYNDI_CATBORG "FELI-Combat" -#define CYBORG_ICON_TYPE_NINJA_CATBORG "FELI-Ninja" +// F3-LINE BORG DEFINES BELOW + +#define CYBORG_ICON_ALL_FELI 'modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi' + +#define CYBORG_ICON_TYPE_GEN_FELI "FELI-Standard" +#define CYBORG_ICON_TYPE_SCI_FELI "FELI-Research" +#define CYBORG_ICON_TYPE_ENG_FELI "FELI-Engineer" +#define CYBORG_ICON_TYPE_MED_FELI "FELI-Medical" +#define CYBORG_ICON_TYPE_CAR_FELI "FELI-Cargo" +#define CYBORG_ICON_TYPE_SERV_FELI "FELI-Service" +#define CYBORG_ICON_TYPE_PK_FELI "FELI-Pk" +#define CYBORG_ICON_TYPE_JANI_FELI "FELI-Janitor" +#define CYBORG_ICON_TYPE_MINE_FELI "FELI-Mining" +#define CYBORG_ICON_TYPE_SEC_FELI "FELI-Security" +#define CYBORG_ICON_TYPE_SYNDI_FELI "FELI-Combat" +#define CYBORG_ICON_TYPE_NINJA_FELI "FELI-Ninja" + + +// KITTY BORG DEFINES BELOW + +#define CYBORG_ICON_SCI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sci.dmi' +#define CYBORG_ICON_ENG_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_engi.dmi' +#define CYBORG_ICON_MED_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_medicat.dmi' +#define CYBORG_ICON_SEC_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sec.dmi' +#define CYBORG_ICON_SERV_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_service.dmi' +#define CYBORG_ICON_JANI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_jani.dmi' +#define CYBORG_ICON_MINE_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_mine.dmi' + +// CAT BORG DEFINES BELOW + +#define CYBORG_ICON_SCI_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi' +#define CYBORG_ICON_ENG_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi' +#define CYBORG_ICON_MED_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi' +#define CYBORG_ICON_SEC_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi' +#define CYBORG_ICON_SERV_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi' +#define CYBORG_ICON_MINE_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi' /mob/living/silicon/robot/model/centcom icon = CYBORG_ICON_CENTCOM_WIDE_BUBBER diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm index 77fea6f6577..3e5aa7b57e1 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm @@ -1,6 +1,8 @@ // The actual code to work these in -// Cyborg model trait procs below +/****************************************************** + Cyborg model trait procs below +*******************************************************/ //For all quadruped cyborgs /obj/item/robot_model/proc/update_quadruped() @@ -16,8 +18,9 @@ cyborg.set_base_pixel_x(0) remove_verb(cyborg, /mob/living/silicon/robot/proc/rest_style) +// TODO: Move Cat like grace to it's own thing //For cyborgs who have a lighter chassis -// NOTE WORKS BEST WITH ONLY 32 X 32 CYBORBG SPRITES!!! +// !!!NOTE WORKS BEST WITH ONLY 32 X 32 CYBORBG SPRITES!!! /obj/item/robot_model/proc/update_lightweight() var/mob/living/silicon/robot/cyborg = robot || loc if (!istype(robot)) @@ -64,7 +67,9 @@ else remove_verb(cyborg, /mob/living/silicon/robot/proc/robot_lay_down) -// Cyborg model types below + +// TODO: MOVE HAT OFFSET DEFINES TO ROBOT_DEFINES! +//Hat offset defines #define TALL_HAT_OFFSET \ SKIN_HAT_OFFSET = list("north" = list(0, 15), "south" = list(0, 15), "east" = list(2, 15), "west" = list(-2, 15)), \ @@ -108,6 +113,11 @@ SKIN_HAT_OFFSET = list("north" = list(16, -4), "south" = list(16, -15), "east" = list(35, -7), "west" = list(-3, -7)), \ SKIN_HAT_REST_OFFSET = list("north" = list(16, -6), "south" = list(16, -17), "east" = list(35, -14), "west" = list(-3, -14)) + +/****************************************************** + Cyborg model types below +*******************************************************/ + // Centcom cyborgs /obj/item/robot_model/centcom name = "Central Command" @@ -214,8 +224,8 @@ model_traits = list(TRAIT_KNOW_ROBO_WIRES, TRAIT_RESEARCH_CYBORG) borg_skins = list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_SCI_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SCI_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -306,10 +316,22 @@ SKIN_ICON_STATE = "haydeesci", SKIN_ICON = CYBORG_ICON_SCI_HAYDEE_BUBBER, ), + "K1-T7Y" = list( + SKIN_ICON_STATE = "sci", + SKIN_ICON = CYBORG_ICON_SCI_KITTYBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), + ), + "C9-T7O" = list( + SKIN_ICON_STATE = "sci", + SKIN_ICON = CYBORG_ICON_SCI_CATBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), + ), ) /* BUBBER SPRITE ADDITIONS BELOW */ + +// Clown borgs /obj/item/robot_model/clown/Initialize(mapload) . = ..() borg_skins |= list( @@ -326,12 +348,13 @@ ), ) +// Standard borgs /obj/item/robot_model/standard/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_GEN_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_GEN_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -342,12 +365,13 @@ ), ) +// Medical borgs /obj/item/robot_model/medical/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_MED_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_MED_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -378,14 +402,25 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET ), + "K1-T7Y" = list( + SKIN_ICON_STATE = "medicat", + SKIN_ICON = CYBORG_ICON_MED_KITTYBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), + ), + "C9-T7O" = list( + SKIN_ICON_STATE = "meowdical", + SKIN_ICON = CYBORG_ICON_MED_CATBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), + ), ) +// Engineering borgs /obj/item/robot_model/engineering/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_ENG_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_ENG_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -416,14 +451,25 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET ), + "K1-T7Y" = list( + SKIN_ICON_STATE = "engi", + SKIN_ICON = CYBORG_ICON_ENG_KITTYBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), + ), + "C9-T7O" = list( + SKIN_ICON_STATE = "engi", + SKIN_ICON = CYBORG_ICON_ENG_CATBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), + ), ) +// Jani borgs /obj/item/robot_model/janitor/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_JANI_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_JANI_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -449,14 +495,20 @@ SKIN_ICON_STATE = "HaydeeJannieClassic", SKIN_ICON = CYBORG_ICON_JANI_HAYDEE_BUBBER, ), + "K1-T7Y" = list( + SKIN_ICON_STATE = "jani", + SKIN_ICON = CYBORG_ICON_JANI_KITTYBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), + ), ) +// Mining borgs /obj/item/robot_model/miner/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_MINE_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_MINE_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -473,6 +525,16 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), CORRUPT_HAT_OFFSET ), + "K1-T7Y" = list( + SKIN_ICON_STATE = "mining", + SKIN_ICON = CYBORG_ICON_MINE_KITTYBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), + ), + "C9-T7O" = list( + SKIN_ICON_STATE = "mining", + SKIN_ICON = CYBORG_ICON_MINE_CATBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), + ), //64x48 sprites below (Raptor) "Raptor" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, @@ -503,15 +565,27 @@ ), ) +// Security borgs /obj/item/robot_model/security/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_SEC_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SEC_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), + //64x32 Sprites below (Wide) + "K1-T7Y" = list( + SKIN_ICON_STATE = "sec", + SKIN_ICON = CYBORG_ICON_SEC_KITTYBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), + ), + "C9-T7O" = list( + SKIN_ICON_STATE = "sec", + SKIN_ICON = CYBORG_ICON_SEC_CATBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), + ), //32x64 Sprites below (Tall) "Meka - Bluesec" = list( SKIN_ICON_STATE = "mekasecalt", @@ -528,12 +602,13 @@ ), ) +// Peacekeeper borgs /obj/item/robot_model/peacekeeper/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_PK_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_PK_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -587,12 +662,13 @@ ), ) +// Service borgs /obj/item/robot_model/service/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_SERV_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SERV_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -639,8 +715,19 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET ), + "K1-T7Y" = list( + SKIN_ICON_STATE = "service", + SKIN_ICON = CYBORG_ICON_SERV_KITTYBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), + ), + "C9-T7O" = list( + SKIN_ICON_STATE = "service", + SKIN_ICON = CYBORG_ICON_SERV_CATBORG, + SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), + ), ) +// Cargo borgs /obj/item/robot_model/cargo/Initialize(mapload) . = ..() borg_skins |= list( @@ -650,8 +737,8 @@ SMOL_RAPTOR_HAT_OFFSET ), "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_CAR_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_CAR_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL, TRAIT_R_LIGHT_WEIGHT), F3LINE_HAT_OFFSET ), @@ -669,6 +756,7 @@ ), ) +// Syndicate jack borgs /obj/item/robot_model/syndicatejack/Initialize(mapload) . = ..() borg_skins |= list( @@ -699,8 +787,8 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ), "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), F3LINE_HAT_OFFSET ), @@ -722,6 +810,7 @@ ), ) +// Syndicate borgs /obj/item/robot_model/syndicate borg_skins = list( //DEFAULT MEDICAL MODULE @@ -740,8 +829,8 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ), "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), F3LINE_HAT_OFFSET ), @@ -763,6 +852,7 @@ ), ) +// Syndicate medical borgs /obj/item/robot_model/syndicate_medical borg_skins = list( //DEFAULT MEDICAL MODULE @@ -783,8 +873,8 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ), "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), F3LINE_HAT_OFFSET ), @@ -806,6 +896,7 @@ ), ) +// Syndicate Saboteur borgs /obj/item/robot_model/saboteur borg_skins = list( //DEFAULT SABOTEUR MODULE @@ -820,8 +911,8 @@ SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ), "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_SYNDI_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), F3LINE_HAT_OFFSET ), @@ -844,7 +935,7 @@ ), ) - +// Ninja borgs /obj/item/robot_model/ninja/Initialize(mapload) . = ..() borg_skins |= list( @@ -862,8 +953,8 @@ ), */ "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_NINJA_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_NINJA_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), F3LINE_HAT_OFFSET ), @@ -875,12 +966,13 @@ ), ) +// Ninja Saboteur borgs /obj/item/robot_model/ninja_saboteur/Initialize(mapload) . = ..() borg_skins |= list( "F3-LINE" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_NINJA_CATBORG, - SKIN_ICON = CYBORG_ICON_ALL_CATBORG, + SKIN_ICON_STATE = CYBORG_ICON_TYPE_NINJA_FELI, + SKIN_ICON = CYBORG_ICON_ALL_FELI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), F3LINE_HAT_OFFSET ), @@ -926,18 +1018,18 @@ #undef CYBORG_ICON_CC_SMOLRAPTOR //F3-LINE -#undef CYBORG_ICON_ALL_CATBORG -#undef CYBORG_ICON_TYPE_GEN_CATBORG -#undef CYBORG_ICON_TYPE_SCI_CATBORG -#undef CYBORG_ICON_TYPE_ENG_CATBORG -#undef CYBORG_ICON_TYPE_MED_CATBORG -#undef CYBORG_ICON_TYPE_SERV_CATBORG -#undef CYBORG_ICON_TYPE_PK_CATBORG -#undef CYBORG_ICON_TYPE_JANI_CATBORG -#undef CYBORG_ICON_TYPE_MINE_CATBORG -#undef CYBORG_ICON_TYPE_SEC_CATBORG -#undef CYBORG_ICON_TYPE_SYNDI_CATBORG -#undef CYBORG_ICON_TYPE_NINJA_CATBORG +#undef CYBORG_ICON_ALL_FELI +#undef CYBORG_ICON_TYPE_GEN_FELI +#undef CYBORG_ICON_TYPE_SCI_FELI +#undef CYBORG_ICON_TYPE_ENG_FELI +#undef CYBORG_ICON_TYPE_MED_FELI +#undef CYBORG_ICON_TYPE_SERV_FELI +#undef CYBORG_ICON_TYPE_PK_FELI +#undef CYBORG_ICON_TYPE_JANI_FELI +#undef CYBORG_ICON_TYPE_MINE_FELI +#undef CYBORG_ICON_TYPE_SEC_FELI +#undef CYBORG_ICON_TYPE_SYNDI_FELI +#undef CYBORG_ICON_TYPE_NINJA_FELI //Haydeez borgs are nuts #undef CYBORG_ICON_MED_HAYDEE_BUBBER @@ -949,6 +1041,23 @@ #undef CYBORG_ICON_JANI_HAYDEE_BUBBER #undef CYBORG_ICON_SYNDIE_HAYDEE_BUBBER +//Kittyborgs +#undef CYBORG_ICON_SCI_KITTYBORG +#undef CYBORG_ICON_ENG_KITTYBORG +#undef CYBORG_ICON_MED_KITTYBORG +#undef CYBORG_ICON_SEC_KITTYBORG +#undef CYBORG_ICON_SERV_KITTYBORG +#undef CYBORG_ICON_JANI_KITTYBORG +#undef CYBORG_ICON_MINE_KITTYBORG + +//Catborgs +#undef CYBORG_ICON_SCI_CATBORG +#undef CYBORG_ICON_ENG_CATBORG +#undef CYBORG_ICON_MED_CATBORG +#undef CYBORG_ICON_SEC_CATBORG +#undef CYBORG_ICON_SERV_CATBORG +#undef CYBORG_ICON_MINE_CATBORG + //Hat Offsets #undef TALL_HAT_OFFSET #undef ZOOMBA_HAT_OFFSET diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi index eb2e7366c15..358300a6e3f 100644 Binary files a/modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi and b/modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/CREDIT.MD b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/CREDIT.MD new file mode 100644 index 00000000000..7e389d317e5 --- /dev/null +++ b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/CREDIT.MD @@ -0,0 +1,7 @@ +**File:** `modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs`
+**Creator:** Toriate
+**License Holders:** Matica, Cameron The Raven, Spotteh
+**Link:** https://github.com/VOREStation/VOREStation/pull/16910
+**License:** [CC BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/)
+**Notes:** All files within this folder are covered under the above license, as per the included attribution.txt file +
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/LICENSE.txt b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/LICENSE.txt new file mode 100644 index 00000000000..b930cc2de84 --- /dev/null +++ b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/LICENSE.txt @@ -0,0 +1,4 @@ +Catborgs and Kittyborgs are licensed under CC BY-NC-SA 3.0, the full text of which can be found at the following URL: +https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode +License Holders: Matica, Cameron The Raven, Spotteh +Created by Toriate. diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi new file mode 100644 index 00000000000..249d6a6728b Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi new file mode 100644 index 00000000000..750a0df29bd Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi new file mode 100644 index 00000000000..a201edfdf49 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi new file mode 100644 index 00000000000..0f1b73e3518 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi new file mode 100644 index 00000000000..800f47f00a4 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi new file mode 100644 index 00000000000..6dd104b9cf8 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_engi.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_engi.dmi new file mode 100644 index 00000000000..3c473e9f77d Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_engi.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_jani.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_jani.dmi new file mode 100644 index 00000000000..8cabea7e47d Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_jani.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_medicat.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_medicat.dmi new file mode 100644 index 00000000000..45b99802767 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_medicat.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_mine.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_mine.dmi new file mode 100644 index 00000000000..7cb4f52dafa Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_mine.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_sci.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_sci.dmi new file mode 100644 index 00000000000..149b66c359c Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_sci.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_sec.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_sec.dmi new file mode 100644 index 00000000000..bd4b8f25b77 Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_sec.dmi differ diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_service.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_service.dmi new file mode 100644 index 00000000000..8c67ab363fe Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/Kittyborg_service.dmi differ