diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 00a9ff22f4..7c4c28d211 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -677,6 +677,18 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) icon_state = "scrubpuppy" item_state = "scrubpuppy" +/obj/item/toy/plush/borgplushie/meddrake + name = "MediDrake Plushie" + desc = "An adorable stuffed toy of a drake robot." + icon_state = "meddrake" + item_state = "meddrake" +// drakeborg by Navier#1236 | CC BY-NC-SA 3.0 | Commissioned artist: deviantart.com/mizartz +/obj/item/toy/plush/borgplushie/secdrake + name = "SecDrake Plushie" + desc = "An adorable stuffed toy of a drake robot." + icon_state = "secdrake" + item_state = "secdrake" + /obj/item/toy/plush/aiplush name = "AI plushie" desc = "A little stuffed toy AI core... it appears to be malfunctioning." diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 8f103c496e..24e1581979 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -360,7 +360,8 @@ "Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinamed"), "Eyebot" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "eyebotmed"), "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymed"), - "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_med") + "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_med"), + "Drake" = image(icon = 'modular_citadel/icons/mob/drakemech.dmi', icon_state = "drakemedbox") // drakeborg by Navier#1236 | CC BY-NC-SA 3.0 | Commissioned artist: deviantart.com/mizartz ) var/list/L = list("Medihound" = "medihound", "Medihound Dark" = "medihounddark", "Vale" = "valemed") for(var/a in L) @@ -423,6 +424,13 @@ moduleselect_icon = "medihound" moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' dogborg = TRUE + if("Drake") + cyborg_base_icon = "drakemed" + cyborg_icon_override = 'modular_citadel/icons/mob/drakemech.dmi' + sleeper_overlay = "drakemedsleeper" + moduleselect_icon = "medihound" + moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi' + dogborg = TRUE else return FALSE return ..() @@ -480,7 +488,8 @@ "Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinaeng"), "Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "spidereng"), "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyeng"), - "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_engi") + "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_engi"), + "Drake" = image(icon = 'modular_citadel/icons/mob/drakemech.dmi', icon_state = "drakeengbox") // drakeborg by Navier#1236 | CC BY-NC-SA 3.0 | Commissioned artist: deviantart.com/mizartz ) var/list/L = list("Pup Dozer" = "pupdozer", "Vale" = "valeeng") for(var/a in L) @@ -540,6 +549,11 @@ cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' sleeper_overlay = "alinasleeper" dogborg = TRUE + if("Drake") + cyborg_base_icon = "drakeeng" + cyborg_icon_override = 'modular_citadel/icons/mob/drakemech.dmi' + sleeper_overlay = "drakeengsleeper" + dogborg = TRUE else return FALSE return ..() @@ -579,7 +593,8 @@ "Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinasec"), "Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "spidersec"), "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavysec"), - "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_sec") + "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_sec"), + "Drake" = image(icon = 'modular_citadel/icons/mob/drakemech.dmi', icon_state = "drakesecbox") // drakeborg by Navier#1236 | CC BY-NC-SA 3.0 | Commissioned artist: deviantart.com/mizartz ) var/list/L = list("K9" = "k9", "Vale" = "valesec", "K9 Dark" = "k9dark") for(var/a in L) @@ -637,6 +652,11 @@ sleeper_overlay = "valesecsleeper" cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' dogborg = TRUE + if("Drake") + cyborg_base_icon = "drakesec" + cyborg_icon_override = 'modular_citadel/icons/mob/drakemech.dmi' + sleeper_overlay = "drakesecsleeper" + dogborg = TRUE else return FALSE return ..() @@ -680,7 +700,8 @@ var/static/list/peace_icons = sortList(list( "Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "peace"), "Borgi" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "borgi"), - "Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "whitespider") + "Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "whitespider"), + "Drake" = image(icon = 'modular_citadel/icons/mob/drakemech.dmi', icon_state = "drakepeacebox") // drakeborg by Navier#1236 | CC BY-NC-SA 3.0 | Commissioned artist: deviantart.com/mizartz )) 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) @@ -696,6 +717,11 @@ hat_offset = INFINITY cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi' has_snowflake_deadsprite = TRUE + if("Drake") + cyborg_base_icon = "drakepeace" + cyborg_icon_override = 'modular_citadel/icons/mob/drakemech.dmi' + sleeper_overlay = "drakepeacesleeper" + dogborg = TRUE else return FALSE return ..() @@ -835,8 +861,9 @@ "(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"), "(Janitor) Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "canjan"), - "(Janitor) Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyjan"), - "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_jani") + "(Janitor) Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyres"), + "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_jani"), + "Drake" = image(icon = 'modular_citadel/icons/mob/drakemech.dmi', icon_state = "drakejanitbox") // drakeborg by Navier#1236 | CC BY-NC-SA 3.0 | Commissioned artist: deviantart.com/mizartz ) var/list/L = list("(Service) DarkK9" = "k50", "(Service) Vale" = "valeserv", "(Service) ValeDark" = "valeservdark", "(Janitor) Scrubpuppy" = "scrubpup") @@ -910,6 +937,11 @@ cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi' sleeper_overlay = "jsleeper" dogborg = TRUE + if("Drake") + cyborg_base_icon = "drakejanit" + cyborg_icon_override = 'modular_citadel/icons/mob/drakemech.dmi' + sleeper_overlay = "drakejanitsleeper" + dogborg = TRUE else return FALSE return ..() @@ -956,7 +988,8 @@ "Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinamin"), "Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "canmin"), "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymin"), - "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_miner") + "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_miner"), + "Drake" = image(icon = 'modular_citadel/icons/mob/drakemech.dmi', icon_state = "drakeminebox") // drakeborg by Navier#1236 | CC BY-NC-SA 3.0 | Commissioned artist: deviantart.com/mizartz ) var/list/L = list("Blade" = "blade", "Vale" = "valemine") for(var/a in L) @@ -1002,6 +1035,11 @@ dogborg = TRUE if("Zoomba") cyborg_base_icon = "zoomba_miner" + if("Drake") + cyborg_base_icon = "drakemine" + cyborg_icon_override = 'modular_citadel/icons/mob/drakemech.dmi' + sleeper_overlay = "drakeminesleeper" + dogborg = TRUE else return FALSE return ..() diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 3abb25d8b2..18f20a4a59 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index 8d089a129a..c156b6eb7a 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -23,6 +23,16 @@ category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/lampplushie +/datum/gear/toy/plush/borgplushie/secdrake + name = "SecDrake Plushie" + category = SLOT_IN_BACKPACK + path = /obj/item/toy/plush/borgplushie/secdrake + +/datum/gear/toy/plush/borgplushie/meddrake + name = "MediDrake Plushie" + category = SLOT_IN_BACKPACK + path = /obj/item/toy/plush/borgplushie/meddrake + /datum/gear/tennis name = "Classic Tennis Ball" category = SLOT_IN_BACKPACK