diff --git a/code/game/machinery/clawmachine.dm b/code/game/machinery/clawmachine.dm index ff65f31c84..b9ce0dd797 100644 --- a/code/game/machinery/clawmachine.dm +++ b/code/game/machinery/clawmachine.dm @@ -58,8 +58,13 @@ /obj/item/toy/plushie/tuxedo_cat, /obj/item/toy/plushie/borgplushie/medihound, /obj/item/toy/plushie/borgplushie/scrubpuppy, - /obj/item/toy/plushie/borgplushie/drakiesec, - /obj/item/toy/plushie/borgplushie/drakiemed, + /obj/item/toy/plushie/borgplushie/drake/sec, + /obj/item/toy/plushie/borgplushie/drake/med, + /obj/item/toy/plushie/borgplushie/drake/sci, + /obj/item/toy/plushie/borgplushie/drake/eng, + /obj/item/toy/plushie/borgplushie/drake/mine, + /obj/item/toy/plushie/borgplushie/drake/jani, + /obj/item/toy/plushie/borgplushie/drake/trauma, /obj/item/toy/plushie/otter ) diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index dbe34a94e3..e173df5465 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -94,16 +94,48 @@ name = "janihound plushie" icon_state = "scrubpuppy" -/obj/item/toy/plushie/borgplushie/drakiesec - name = "security drake plushie" +/obj/item/toy/plushie/borgplushie/drake icon = 'icons/obj/drakietoy_vr.dmi' + var/lights_glowing = FALSE + +/obj/item/toy/plushie/borgplushie/drake/AltClick(mob/living/user) + . = ..() + lights_glowing = !lights_glowing + update_icon() + +/obj/item/toy/plushie/borgplushie/drake/update_icon() + cut_overlays() + if (lights_glowing) + add_overlay(emissive_appearance(icon, "[icon_state]-lights")) + +/obj/item/toy/plushie/borgplushie/drake/sec + name = "security drake plushie" icon_state = "secdrake" -/obj/item/toy/plushie/borgplushie/drakiemed +/obj/item/toy/plushie/borgplushie/drake/med name = "medical drake plushie" - icon = 'icons/obj/drakietoy_vr.dmi' icon_state = "meddrake" +/obj/item/toy/plushie/borgplushie/drake/sci + name = "science drake plushie" + icon_state = "scidrake" + +/obj/item/toy/plushie/borgplushie/drake/jani + name = "janitor drake plushie" + icon_state = "janidrake" + +/obj/item/toy/plushie/borgplushie/drake/eng + name = "engineering drake plushie" + icon_state = "engdrake" + +/obj/item/toy/plushie/borgplushie/drake/mine + name = "mining drake plushie" + icon_state = "minedrake" + +/obj/item/toy/plushie/borgplushie/drake/trauma + name = "trauma drake plushie" + icon_state = "traumadrake" + /obj/item/toy/plushie/foxbear name = "toy fox" desc = "Issa fox!" diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index b75c0887b2..4ef667116c 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -748,8 +748,13 @@ /obj/item/toy/plushie/nukeplushie, /obj/item/toy/plushie/otter, /obj/item/toy/plushie/vox, - /obj/item/toy/plushie/borgplushie/drakiesec, - /obj/item/toy/plushie/borgplushie/drakiemed) + pick(list(/obj/item/toy/plushie/borgplushie/drake/sec, + /obj/item/toy/plushie/borgplushie/drake/med, + /obj/item/toy/plushie/borgplushie/drake/sci, + /obj/item/toy/plushie/borgplushie/drake/jani, + /obj/item/toy/plushie/borgplushie/drake/eng, + /obj/item/toy/plushie/borgplushie/drake/mine, + /obj/item/toy/plushie/borgplushie/drake/trauma))) //VOREStation Add End /obj/random/plushielarge diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 71d8b8c37d..bd83241019 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -57,6 +57,7 @@ // look if theres a better way to do this im all ears blacklisted_types += subtypesof(/obj/item/toy/plushie/therapy) blacklisted_types += subtypesof(/obj/item/toy/plushie/fluff) + blacklisted_types += /obj/item/toy/plushie/borgplushie/drake //VOREStation addition for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - blacklisted_types) plushies[initial(plushie_type.name)] = plushie_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies)) diff --git a/icons/mob/drakeborg/drakeborg_vr.dmi b/icons/mob/drakeborg/drakeborg_vr.dmi index 56a79ce19c..2165e78525 100644 Binary files a/icons/mob/drakeborg/drakeborg_vr.dmi and b/icons/mob/drakeborg/drakeborg_vr.dmi differ diff --git a/icons/obj/drakietoy_vr.dmi b/icons/obj/drakietoy_vr.dmi index 34a4932513..eb1c985a26 100644 Binary files a/icons/obj/drakietoy_vr.dmi and b/icons/obj/drakietoy_vr.dmi differ