diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 97a283619e..2ca7ba43ea 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -413,6 +413,9 @@ "Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakemedbox"), "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_medical"), // SPLURT Addon "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) ) var/list/L = list("Medihound" = "medihound", "Medihound Dark" = "medihounddark", "Vale" = "valemed") for(var/a in L) @@ -543,6 +546,27 @@ cyborg_base_icon = "mekamed" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' hat_offset = 3 + if("Feline") // SPLURT Addon (Chomp Port) + cyborg_base_icon = "vixmed" + cyborg_icon_override = 'modular_splurt/icons/mob/widerobot.dmi' + sleeper_overlay = "vixmed-sleeper" + moduleselect_icon = "medihound" + moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' + dogborg = TRUE + if("Raptor V-4") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "medraptor" + cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' + sleeper_overlay = "medraptor_sleeper" + moduleselect_icon = "medihound" + moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' + dogborg = TRUE + if("Raptor V-4 (alt)") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "traumaraptor" + cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' + sleeper_overlay = "traumaraptor_sleeper" + moduleselect_icon = "medihound" + moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' + dogborg = TRUE else return FALSE return ..() @@ -617,7 +641,9 @@ "Otie" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "otiee-b"), // SPLURT Adoon (Skyrat Port) "Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakeengbox"), "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 + "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) ) var/list/L = list("Pup Dozer" = "pupdozer", "Vale" = "valeeng") for(var/a in L) @@ -748,6 +774,16 @@ cyborg_base_icon = "haydeeengi" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Feline") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "vixengi" + cyborg_icon_override = 'modular_splurt/icons/mob/widerobot.dmi' + sleeper_overlay = "vixengi-sleeper" + dogborg = TRUE + if("Raptor V-4") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "engiraptor" + cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' + sleeper_overlay = "engiraptor-sleeper" + dogborg = TRUE else return FALSE return ..() @@ -805,7 +841,9 @@ "EdgyGirl" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "prettyboi-b"), // SPLURT Addon (VIRGO Port) "Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakesecbox"), "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 + "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) ) var/list/L = list("K9" = "k9", "Vale" = "valesec", "K9 Dark" = "k9dark") for(var/a in L) @@ -937,6 +975,16 @@ cyborg_base_icon = "haydeesec" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("Feline") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "vixsec" + sleeper_overlay = "vixsec-sleeper" + cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' + dogborg = TRUE + if("Raptor V-4") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "secraptor" + sleeper_overlay = "secraptor-sleeper" + cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' + dogborg = TRUE else return FALSE return ..() @@ -995,6 +1043,7 @@ "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) )) 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) @@ -1064,6 +1113,11 @@ cyborg_base_icon = "mekapeace" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' hat_offset = 3 + if("Feline") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "vixpk" + cyborg_icon_override = 'modular_splurt/icons/mob/widerobot.dmi' + sleeper_overlay = "vixpk-sleeper" + dogborg = TRUE else return FALSE return ..() @@ -1211,6 +1265,8 @@ "(Service) K69" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "k69-b"), // SPLURT Addon (Skyrat Port) // The Cursed One "(Service) Borgi" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "borgi-serv-b"), // SPLURT Addon (Skyrat Port) "(Service) Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekaserve"), // SPLURT Addon + "(Service) Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixserv-b"), // SPLURT Addon (ChompS Port) + "(Service) Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "serviraptor-b"), // SPLURT Addon (ChompS Port) "(Janitor) Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "janitor"), "(Janitor) Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinajan"), "(Janitor) Sleek" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "sleekjan"), @@ -1235,6 +1291,8 @@ "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_service"), // SPLURT Addon "(Janitor) Haydee" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "haydeejan"), // SPLURT Addon "(Janitor) Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekajani"), // SPLURT Addon + "(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 ) var/list/L = list("(Service) DarkK9" = "k50", "(Service) Vale" = "valeserv", "(Service) ValeDark" = "valeservdark", @@ -1334,6 +1392,16 @@ cyborg_base_icon = "mekaserve" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' hat_offset = 3 + if("(Service) Feline") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "vixserv" + cyborg_icon_override = 'modular_splurt/icons/mob/widerobot.dmi' + sleeper_overlay = "vixserv-sleeper" + dogborg = TRUE + if("(Service) Raptor V-4") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "serviraptor" + cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' + sleeper_overlay = "serviraptor-sleeper" + dogborg = TRUE if("(Janitor) Default") cyborg_base_icon = "janitor" if("(Janitor) Marina") @@ -1432,6 +1500,16 @@ cyborg_base_icon = "mekajani" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' hat_offset = 3 + if("(Janitor) Feline") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "vixjani" + cyborg_icon_override = 'modular_splurt/icons/mob/widerobot.dmi' + sleeper_overlay = "vixjani-sleeper" + dogborg = TRUE + if("(Janitor) Raptor V-4") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "janiraptor" + cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' + sleeper_overlay = "janiraptor-sleeper" + dogborg = TRUE if("(Waiter) Meka") cyborg_base_icon = "mekaserve_alt" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' @@ -1500,6 +1578,8 @@ "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_mining"), // SPLURT Addon "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) ) var/list/L = list("Blade" = "blade", "Vale" = "valemine") for(var/a in L) @@ -1611,6 +1691,16 @@ cyborg_base_icon = "mekamine" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' hat_offset = 3 + if("Feline") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "vixmine" + cyborg_icon_override = 'modular_splurt/icons/mob/widerobot.dmi' + sleeper_overlay = "vixmine-sleeper" + dogborg = TRUE + if("Raptor V-4") // SPLURT Addon (ChompS Port) + cyborg_base_icon = "mineraptor" + cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' + sleeper_overlay = "mineraptor-sleeper" + dogborg = TRUE else return FALSE return ..() 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 b9fdbe284c..d9d74bff18 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 @@ -175,7 +175,7 @@ "Assaultron" = image(icon = 'modular_splurt/icons/mob/robots_cargo.dmi', icon_state = "assaultron_cargo"), "Meka" = image(icon = 'modular_splurt/icons/mob/robots_32x64.dmi', icon_state = "mekacargo"), // SPLURT Addon ) - var/list/L = list("Cargohound" = "cargohound", "Cargohound Dark" = "cargohounddark", "Vale" = "valecargo") + var/list/L = list("Cargohound" = "cargohound", "Cargohound Dark" = "cargohounddark", "Vale" = "valecargo", "Feline" = "vixcargo") for(var/a in L) var/image/wide = image(icon = 'modular_splurt/icons/mob/widerobots_cargo.dmi', icon_state = L[a]) wide.pixel_x = -16 @@ -224,6 +224,11 @@ cyborg_base_icon = "mekacargo" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' hat_offset = 3 + if("Feline") // ChompS Port + cyborg_base_icon = "vixcargo" + cyborg_icon_override = 'modular_splurt/icons/mob/widerobots_cargo.dmi' + sleeper_overlay = "vixcargo-sleeper" + dogborg = TRUE else return FALSE return ..() diff --git a/modular_splurt/icons/mob/robots_64x45.dmi b/modular_splurt/icons/mob/robots_64x45.dmi new file mode 100644 index 0000000000..a472a2abee Binary files /dev/null and b/modular_splurt/icons/mob/robots_64x45.dmi differ diff --git a/modular_splurt/icons/mob/widerobot.dmi b/modular_splurt/icons/mob/widerobot.dmi index cebde2852b..c414d3ce98 100644 Binary files a/modular_splurt/icons/mob/widerobot.dmi and b/modular_splurt/icons/mob/widerobot.dmi differ diff --git a/modular_splurt/icons/mob/widerobots_cargo.dmi b/modular_splurt/icons/mob/widerobots_cargo.dmi index cd1e46bea4..15c1845f28 100644 Binary files a/modular_splurt/icons/mob/widerobots_cargo.dmi and b/modular_splurt/icons/mob/widerobots_cargo.dmi differ