diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index f68f1b7c99c..0c1fbdeaaeb 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -206,6 +206,7 @@ cyborg_base_icon = details[SKIN_ICON_STATE] if(!isnull(details[SKIN_ICON])) cyborg.icon = details[SKIN_ICON] + cyborg_icon_override = details[SKIN_ICON] // SKYRAT EDIT ADDITION if(!isnull(details[SKIN_PIXEL_X])) cyborg.base_pixel_x = details[SKIN_PIXEL_X] if(!isnull(details[SKIN_PIXEL_Y])) @@ -409,10 +410,31 @@ model_select_icon = "medical" model_traits = list(TRAIT_PUSHIMMUNE) hat_offset = 3 + // SKYRAT EDIT START: Adds all the cyborg skins. borg_skins = list( - "Machinified Doctor" = list(SKIN_ICON_STATE = "medical"), + "Machinified Doctor" = list(SKIN_ICON_STATE = "medical", SKIN_TRAITS = list(R_TRAIT_SMALL)), "Qualified Doctor" = list(SKIN_ICON_STATE = "qualified_doctor"), + "Zoomba" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "zoomba_med"), + "Droid" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "medical", SKIN_HAT_OFFSET = 4), + "Sleek" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "sleekmed"), + "Marina" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "marinamed"), + "Eyebot" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "eyebotmed", SKIN_TRAITS = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_SMALL)), + "Heavy" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "heavymed"), + "Bootyborg" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "bootymedical"), + "Male Bootyborg" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "male_bootymedical"), + // PLEASE ASSUME THE POSITION + "Protectron" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "protectron_medical"), + "Miss M" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "missm_med"), + "Arachne" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "arachne"), + "Insekt" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "insekt-Med"), + "Mech" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', SKIN_ICON_STATE = "gibbs"), + "Hound" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi', SKIN_ICON_STATE = "medihound", SKIN_TRAITS = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE)), + "Vale" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi', SKIN_ICON_STATE = "valemed", SKIN_TRAITS = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE)), + "Alina" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi', SKIN_ICON_STATE = "alina-med", SKIN_TRAITS = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE)), + "Drake" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi', SKIN_ICON_STATE = "drakemed", SKIN_TRAITS = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE)), + "Borgi" = list(SKIN_ICON = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi', SKIN_ICON_STATE = "borgi-medi", SKIN_TRAITS = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE)), ) + // SKYRAT EDIT END /obj/item/robot_model/miner name = "Miner" diff --git a/modular_skyrat/modules/altborgs/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_skyrat/modules/altborgs/code/modules/mob/living/silicon/robot/robot_modules.dm index 329c2f6b159..e12d5db53ce 100644 --- a/modular_skyrat/modules/altborgs/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/modular_skyrat/modules/altborgs/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -85,132 +85,6 @@ return FALSE return ..() -//MEDICAL -/obj/item/robot_model/medical/be_transformed_to(obj/item/robot_model/old_model) - var/mob/living/silicon/robot/cyborg = loc - var/static/list/med_icons - if(!med_icons) - med_icons = list( - "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "medical"), - "Qualified Doctor" = image(icon = 'icons/mob/robots.dmi', icon_state = "qualified_doctor"), - "Droid" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "medical"), - "Sleek" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "sleekmed"), - "Marina" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "marinamed"), - "Eyebot" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "eyebotmed"), - "Heavy" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "heavymed"), - "Bootyborg" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "bootymedical"), - "Male Bootyborg" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "male_bootymedical"), - "Protectron" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "protectron_medical"), - "Miss M" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "missm_med"), - "Zoomba" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "zoomba_med"), - "Arachne" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "arachne"), - "Insekt" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "insekt-Med"), - "Mech" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi', icon_state = "gibbs"), - "Drake" = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi', icon_state = "drakemedbox") - ) - var/list/L = list("Hound" = "medihound", "Darkhound" = "medihounddark", "Vale" = "valemed", "Borgi" = "borgi-medi") - for(var/a in L) - var/image/wide = image(icon = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi', icon_state = L[a]) - wide.pixel_x = -16 - med_icons[a] = wide - med_icons = sort_list(med_icons) - var/med_borg_icon = show_radial_menu(cyborg, cyborg , med_icons, custom_check = CALLBACK(src, .proc/check_menu, cyborg, old_model), radius = 42, require_near = TRUE) - switch(med_borg_icon) - if("Default") - cyborg_base_icon = "medical" - model_features = list(R_TRAIT_SMALL) - if("Qualified Doctor") - cyborg_base_icon = "qualified_doctor" - if("Zoomba") - cyborg_base_icon = "zoomba_med" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_SMALL) - if("Droid") - cyborg_base_icon = "medical" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - hat_offset = 4 - if("Sleek") - cyborg_base_icon = "sleekmed" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Marina") - cyborg_base_icon = "marinamed" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Eyebot") - cyborg_base_icon = "eyebotmed" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_SMALL) - if("Heavy") - cyborg_base_icon = "heavymed" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Bootyborg") - cyborg_base_icon = "bootymedical" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Male Bootyborg") - cyborg_base_icon = "male_bootymedical" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Protectron") - cyborg_base_icon = "protectron_medical" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Miss M") - cyborg_base_icon = "missm_med" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Arachne") - cyborg_base_icon = "arachne" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Insekt") - cyborg_base_icon = "insekt-Med" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - if("Mech") - cyborg_base_icon = "gibbs" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/robots_med.dmi' - //Dogborgs - if("Hound") - cyborg_base_icon = "medihound" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi' - sleeper_overlay = "msleeper" - model_select_icon = "medihound" - model_select_alternate_icon = 'modular_skyrat/modules/altborgs/icons/ui/screen_cyborg.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE) - if("Darkhound") - cyborg_base_icon = "medihounddark" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi' - sleeper_overlay = "mdsleeper" - model_select_icon = "medihound" - model_select_alternate_icon = 'modular_skyrat/modules/altborgs/icons/ui/screen_cyborg.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE) - if("Vale") - cyborg_base_icon = "valemed" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi' - sleeper_overlay = "valemedsleeper" - model_select_icon = "medihound" - model_select_alternate_icon = 'modular_skyrat/modules/altborgs/icons/ui/screen_cyborg.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE) - if("Alina") - cyborg_base_icon = "alina-med" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi' - special_light_key = "alina" - sleeper_overlay = "alinasleeper" - model_select_icon = "medihound" - model_select_alternate_icon = 'modular_skyrat/modules/altborgs/icons/ui/screen_cyborg.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE) - if("Drake") - cyborg_base_icon = "drakemed" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi' - sleeper_overlay = "drakemedsleeper" - model_select_icon = "medihound" - model_select_alternate_icon = 'modular_skyrat/modules/altborgs/icons/ui/screen_cyborg.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE) - if("Borgi") - cyborg_base_icon = "borgi-medi" - cyborg_icon_override = 'modular_skyrat/modules/altborgs/icons/mob/widerobot_med.dmi' - sleeper_overlay = "borgi-medi-sleeper" - model_select_icon = "medihound" - model_select_alternate_icon = 'modular_skyrat/modules/altborgs/icons/ui/screen_cyborg.dmi' - model_features = list(R_TRAIT_UNIQUEWRECK, R_TRAIT_WIDE, R_TRAIT_SMALL) - else - return FALSE - return ..() - //ENGINEERING /obj/item/robot_model/engineering/be_transformed_to(obj/item/robot_model/old_model) var/mob/living/silicon/robot/cyborg = loc