diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 9cf3c580cd..c50f76d0be 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -383,6 +383,7 @@ "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) + "SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_med-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) "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") @@ -540,6 +541,12 @@ moduleselect_icon = "medihound" moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' dogborg = TRUE + if("SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor_med" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + moduleselect_icon = "medihound" + moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' + dogborg = TRUE else return FALSE return ..() @@ -618,6 +625,7 @@ "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) + "SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_eng-b"), // BubberStation Port; Made by @aKromatopzia (GitHub) "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") @@ -768,6 +776,10 @@ cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' sleeper_overlay = "engiraptor-sleeper" dogborg = TRUE + if("SmollRaptor") // BubberStation Port; Made by @aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor_eng" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + dogborg = TRUE else return FALSE return ..() @@ -1044,6 +1056,7 @@ "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) "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "peaceraptor-b"), // SPLURT Addon (ChompS Port) + "SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_pk-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) "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_REF(check_menu), R), radius = 42, require_near = TRUE) @@ -1129,6 +1142,10 @@ cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' sleeper_overlay = "peaceraptor-sleeper" dogborg = TRUE + if("SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor_pk" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + dogborg = TRUE else return FALSE return ..() @@ -1279,6 +1296,7 @@ "(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) "(Fancy) Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "fancyraptor-b"), // SPLURT Addon (ChompS Port) + "(Service) SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_srv-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) "(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"), @@ -1307,6 +1325,8 @@ "(Janitor Alt) Feline" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "vixsci-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) "(Janitor Alt) Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "sciraptor-b"), // SPLURT Addon (ChompS Port) + "(Janitor) SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_jani-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + "(Janitor Alt) SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_sci-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) "(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) @@ -1429,6 +1449,10 @@ cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' sleeper_overlay = "fancyraptor-sleeper" dogborg = TRUE + if("(Service) SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor_srv" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + dogborg = TRUE if("(Janitor) Default") cyborg_base_icon = "janitor" if("(Janitor) Marina") @@ -1552,6 +1576,14 @@ cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' sleeper_overlay = "sciraptor-sleeper" dogborg = TRUE + if("(Janitor) SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor_jani" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + dogborg = TRUE + if("(Janitor Alt) SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub); Ditto with sci module thing. + cyborg_base_icon = "smolraptor_sci" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + dogborg = TRUE if("(Waiter) Meka") cyborg_base_icon = "mekaserve_alt" cyborg_icon_override = 'modular_splurt/icons/mob/robots_32x64.dmi' @@ -1627,6 +1659,7 @@ "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) + "SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_min-b"), // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) "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") @@ -1754,6 +1787,10 @@ cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' sleeper_overlay = "mineraptor-sleeper" dogborg = TRUE + if("SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor_min" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + 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 2e229535c0..4d0509cfb9 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 @@ -23,7 +23,8 @@ "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") + "Cyclone" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "cyclone"), + "SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor-b") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) ) stand_icons = sort_list(stand_icons) var/stand_borg_icon = show_radial_menu(R, R , stand_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE) @@ -90,6 +91,10 @@ cyborg_base_icon = "cyclone" cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi' hat_offset = 3 + if("SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + dogborg = TRUE return ..() /obj/item/robot_module/clown/be_transformed_to(obj/item/robot_module/old_module) @@ -189,7 +194,8 @@ "Drake" = image(icon = 'modular_splurt/icons/mob/widerobots_cargo.dmi', icon_state = "drakecargo"), "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 - "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "caraptor-b") // ChompS Port (base); Additional spriting by @ertyuk421 + "Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "caraptor-b"), // ChompS Port (base); Additional spriting by @ertyuk421 + "SmollRaptor" = image(icon = 'modular_zubbers/icons/mob/smolraptor.dmi', icon_state = "smolraptor_crg-b") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) ) var/list/L = list("Cargohound" = "cargohound", "Cargohound Dark" = "cargohounddark", "Vale" = "valecargo", "Feline" = "vixcargo") for(var/a in L) @@ -251,6 +257,10 @@ cyborg_icon_override = 'modular_splurt/icons/mob/robots_64x45.dmi' sleeper_overlay = "caraptor-sleeper" dogborg = TRUE + if("SmollRaptor") // BubberStation Port; Made by aKhro/@aKromatopzia (GitHub) + cyborg_base_icon = "smolraptor_crg" + cyborg_icon_override = 'modular_zubbers/icons/mob/smolraptor.dmi' + dogborg = TRUE else return FALSE return ..() diff --git a/modular_zubbers/icons/mob/smolraptor.dmi b/modular_zubbers/icons/mob/smolraptor.dmi new file mode 100644 index 0000000000..2c1361d252 Binary files /dev/null and b/modular_zubbers/icons/mob/smolraptor.dmi differ