diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 2ca7ba43ea45..7cf33612eb64 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -415,7 +415,8 @@ "Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekamed"), // SPLURT Addon "Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixmed-b"), // SPLURT Addon (ChompS Port) "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "medraptor-b"), // SPLURT Addon (ChompS Port) - "Raptor V-4 (alt)" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "traumaraptor-b") // SPLURT Addon (ChompS Port) + "Raptor V-4 (alt)" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "traumaraptor-b"), // SPLURT Addon (ChompS Port) + "Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_medical") // SPLURT Addon (Fallout 13) ) var/list/L = list("Medihound" = "medihound", "Medihound Dark" = "medihounddark", "Vale" = "valemed") for(var/a in L) @@ -495,6 +496,10 @@ cyborg_base_icon = "haydeemedical" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_medical" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 if("Medihound") cyborg_base_icon = "medihound" cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' @@ -643,7 +648,8 @@ "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_engi"), // SPLURT Addon "Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeeengi"), // SPLURT Addon "Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixengi-b"), // SPLURT Addon (ChompS Port) - "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "engiraptor-b") // SPLURT Addon (ChompS Port) + "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "engiraptor-b"), // SPLURT Addon (ChompS Port) + "Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_engineer") // SPLURT Addon (Fallout 13) ) var/list/L = list("Pup Dozer" = "pupdozer", "Vale" = "valeeng") for(var/a in L) @@ -725,6 +731,10 @@ cyborg_base_icon = "bootyengineerS" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_engineer" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 if("Pup Dozer") cyborg_base_icon = "pupdozer" cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' @@ -843,7 +853,10 @@ "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_sec"), // SPLURT Addon "Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeesec"), // SPLURT Addon "Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixsec-b"), // SPLURT Addon (ChompS Port) - "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "secraptor-b") // SPLURT Addon (ChompS Port) + "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "secraptor-b"), // SPLURT Addon (ChompS Port) + "Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_security"), // SPLURT Addon (Fallout 13) + "Sentry Bot" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "sentrybot"), // SPLURT Addon (Fallout 13) + "Securitron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "securitron") // SPLURT Addon (Fallout 13) ) var/list/L = list("K9" = "k9", "Vale" = "valesec", "K9 Dark" = "k9dark") for(var/a in L) @@ -918,6 +931,18 @@ cyborg_base_icon = "bootysecurityS" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_security" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 + if("Sentry Bot") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "sentrybot" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 + if("Securitron") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "securitron" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 if("K9") cyborg_base_icon = "k9" sleeper_overlay = "ksleeper" @@ -1043,8 +1068,9 @@ "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_peacekeeper"), // SPLURT Adoon "Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeepk"), // SPLURT Addon "Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekapeace"), // SPLURT Addon - "Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixpk-b") // SPLURT Addon (ChompS Port) - )) + "Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixpk-b"), // SPLURT Addon (ChompS Port) + "Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_peace") // SPLURT Addon (Fallout 13) + )) var/peace_borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) switch(peace_borg_icon) if("Default") @@ -1084,6 +1110,10 @@ cyborg_base_icon = "bootypeaceS" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_peace" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 if("Borgi") cyborg_base_icon = "borgi" moduleselect_icon = "borgi" @@ -1294,6 +1324,9 @@ "(Janitor) Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixjani-b"), // SPLURT Addon (ChompS Port) "(Janitor) Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "janiraptor-b"), // SPLURT Addon (ChompS Port) "(Waiter) Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekaserve_alt"), // SPLURT Addon + "(Service) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_service"), // SPLURT Addon (Fallout 13) + "(Janitor) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_janitor"), // SPLURT Addon (Fallout 13) + "(Pleasure) Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_pleasure") // SPLURT Addon (Fallout 13) ) var/list/L = list("(Service) DarkK9" = "k50", "(Service) Vale" = "valeserv", "(Service) ValeDark" = "valeservdark", "(Janitor) Scrubpuppy" = "scrubpup") @@ -1363,6 +1396,10 @@ cyborg_base_icon = "bootyserviceS" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("(Service) Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_service" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 if("(Service) DarkK9") cyborg_base_icon = "k50" cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' @@ -1464,6 +1501,10 @@ cyborg_base_icon = "bootyjanitorS" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("(Janitor) Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_janitor" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 if("(Janitor) Scrubpuppy") cyborg_base_icon = "scrubpup" cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' @@ -1514,6 +1555,10 @@ cyborg_base_icon = "mekaserve_alt" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' hat_offset = 3 + if("(Pleasure) Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_pleasure" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 else return FALSE return ..() @@ -1579,7 +1624,8 @@ "Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeeminer"), // SPLURT Addon "Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekamine"), // SPLURT Addon "Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixmine-b"), // SPLURT Adoon (ChompS Port) - "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "mineraptor-b") // SPLURT Adoon (ChompS Port) + "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "mineraptor-b"), // SPLURT Adoon (ChompS Port) + "Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_miner") // SPLURT Addon (Fallout 13) ) var/list/L = list("Blade" = "blade", "Vale" = "valemine") for(var/a in L) @@ -1649,6 +1695,10 @@ cyborg_base_icon = "bootyminerS" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Handy") // SPLURT Addon (Fallout 13) + cyborg_base_icon = "handy_miner" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 if("Blade") cyborg_base_icon = "blade" cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm index d9d74bff18d8..367aa095152d 100644 --- a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -20,8 +20,10 @@ "BootyF" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootystandard"), "BootyM" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootystandardM"), "BootyS" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootystandardS"), - "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_standard") - ) + "Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy"), + "Robo-Brain" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "robobrain"), + "Cyclone" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "cyclone") + ) stand_icons = sortList(stand_icons) var/stand_borg_icon = show_radial_menu(R, R , stand_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE) if(!stand_borg_icon) @@ -75,6 +77,18 @@ cyborg_base_icon = "assaultron_standard" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Handy") + cyborg_base_icon = "handy" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 + if("Robo-Brain") + cyborg_base_icon = "robobrain" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 + if("Cyclone") + cyborg_base_icon = "cyclone" + cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' + hat_offset = 3 return ..() /obj/item/robot_module/clown/be_transformed_to(obj/item/robot_module/old_module) diff --git a/modular_splurt/icons/mob/robots.dmi b/modular_splurt/icons/mob/robots.dmi index 4feb96cfabb1..5f5aaee2485b 100644 Binary files a/modular_splurt/icons/mob/robots.dmi and b/modular_splurt/icons/mob/robots.dmi differ