diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7adedbe8dca..70577d1b582 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -697,7 +697,7 @@ icon_state = "redfox" /obj/random/plushie/item_to_spawn() - return pick(subtypesof(/obj/item/toy/plushie) - typesof(/obj/item/toy/plushie/fluff)) //exclude the base type. + return pick(subtypesof(/obj/item/toy/plushie) - typesof(/obj/item/toy/plushie/fluff) - subtypesof(/obj/item/toy/plushie/plasmamanplushie/standart)) //exclude the base type and 11 random plasma plushies /obj/item/toy/plushie/corgi name = "corgi plushie" @@ -1282,11 +1282,61 @@ /obj/item/toy/plushie/plasmamanplushie name = "plasmaman plushie" desc = "A stuffed toy that resembles your purple coworkers. Mmm, yeah, in true plasmaman fashion, it's not cute at all despite the designer's best efforts." - icon_state = "plushie_pman" + icon_state = "plasmaman_plushie_civillian" attack_verb = list("burns", "space beasts", "fwooshes") var/pmanlbite = 'sound/effects/extinguish.ogg' var/cooldown = FALSE +/obj/item/toy/plushie/plasmamanplushie/random/Initialize(mapload) + . = ..() + var/choice = pick(subtypesof(/obj/item/toy/plushie/plasmamanplushie/standart)) + new choice(loc) + return INITIALIZE_HINT_QDEL + + +/obj/item/toy/plushie/plasmamanplushie/standart/sindie + name = "syndicate plasmaman plushie" + icon_state = "plasmaman_plushie_syndicomm" + +/obj/item/toy/plushie/plasmamanplushie/standart/doctor + name = "medical doctor plasmaman plushie" + icon_state = "plasmaman_plushie_doctor" + +/obj/item/toy/plushie/plasmamanplushie/standart/brigmed + name = "brig physician plasmaman plushie" + icon_state = "plasmaman_plushie_brigphysician" + +/obj/item/toy/plushie/plasmamanplushie/standart/chemist + name = "chemist plasmaman plushie" + icon_state = "plasmaman_plushie_chemist" + +/obj/item/toy/plushie/plasmamanplushie/standart/scientist + name = "scientist plasmaman plushie" + icon_state = "plasmaman_plushie_scientist" + +/obj/item/toy/plushie/plasmamanplushie/standart/engineer + name = "station engineer plasmaman plushie" + icon_state = "plasmaman_plushie_engineer" + +/obj/item/toy/plushie/plasmamanplushie/standart/atmostech + name = "atmospheric technician plasmaman plushie" + icon_state = "plasmaman_plushie_atmostech" + +/obj/item/toy/plushie/plasmamanplushie/standart/officer + name = "security officer plasmaman plushie" + icon_state = "plasmaman_plushie_officer" + +/obj/item/toy/plushie/plasmamanplushie/standart/captain + name = "captain plasmaman plushie" + icon_state = "plasmaman_plushie_captain" + +/obj/item/toy/plushie/plasmamanplushie/standart/ntr + name = "nanotrasen representative plasmaman plushie" + icon_state = "plasmaman_plushie_ntr" + +/obj/item/toy/plushie/plasmamanplushie/standart/miner + name = "shaft miner plasmaman plushie" + icon_state = "plasmaman_plushie_shaftminer" /obj/item/toy/plushie/plasmamanplushie/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE) . = ..() @@ -1299,7 +1349,7 @@ return ..() playsound(src, 'sound/effects/extinguish.ogg', 20, 0) - visible_message("Plasmaflood!") + visible_message("Plasssma iss Eternal!") cooldown = TRUE addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 3 SECONDS) diff --git a/code/modules/client/preference/loadout/loadout_plushie.dm b/code/modules/client/preference/loadout/loadout_plushie.dm index 431f0d6c20e..e90ab2146e2 100644 --- a/code/modules/client/preference/loadout/loadout_plushie.dm +++ b/code/modules/client/preference/loadout/loadout_plushie.dm @@ -44,9 +44,26 @@ path = /obj/item/toy/plushie/greyplushie /datum/gear/plushie/plasmamanplushie - display_name = "Plasmaman Plushie" + display_name = "Plasmaman Plushie, select" path = /obj/item/toy/plushie/plasmamanplushie +/datum/gear/plushie/plasmamanplushie/New() + ..() + var/list/plasmamans = list(/obj/item/toy/plushie/plasmamanplushie, + /obj/item/toy/plushie/plasmamanplushie/standart/sindie, + /obj/item/toy/plushie/plasmamanplushie/standart/doctor, + /obj/item/toy/plushie/plasmamanplushie/standart/brigmed, + /obj/item/toy/plushie/plasmamanplushie/standart/chemist, + /obj/item/toy/plushie/plasmamanplushie/standart/scientist, + /obj/item/toy/plushie/plasmamanplushie/standart/engineer, + /obj/item/toy/plushie/plasmamanplushie/standart/atmostech, + /obj/item/toy/plushie/plasmamanplushie/standart/officer, + /obj/item/toy/plushie/plasmamanplushie/standart/captain, + /obj/item/toy/plushie/plasmamanplushie/standart/ntr, + /obj/item/toy/plushie/plasmamanplushie/standart/miner, + ) + gear_tweaks += new /datum/gear_tweak/path(plasmamans, src, TRUE) + /datum/gear/plushie/shardplushie display_name = "Shard Plushie" path = /obj/item/toy/plushie/shardplushie diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index d78818bfa5f..ac0fda9d2df 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index ff26ec4599a..bfc1f869bb4 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ