From 8ca03da239521e8e86cc1fd77de569e840248ceb Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 6 Aug 2020 11:44:27 -0700 Subject: [PATCH 1/2] Merge pull request #7403 from dwinters99/mechtoy-and-arcade Mechtoy and arcade --- code/game/machinery/computer/arcade.dm | 12 +----------- code/game/objects/items/toys.dm | 9 +++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index ffc99e4733..8ef01c9b64 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -14,17 +14,7 @@ /obj/item/clothing/suit/syndicatefake = 2, /obj/item/weapon/storage/fancy/crayons = 2, /obj/item/toy/spinningtoy = 2, - /obj/item/toy/prize/ripley = 1, - /obj/item/toy/prize/fireripley = 1, - /obj/item/toy/prize/deathripley = 1, - /obj/item/toy/prize/gygax = 1, - /obj/item/toy/prize/durand = 1, - /obj/item/toy/prize/honk = 1, - /obj/item/toy/prize/marauder = 1, - /obj/item/toy/prize/seraph = 1, - /obj/item/toy/prize/mauler = 1, - /obj/item/toy/prize/odysseus = 1, - /obj/item/toy/prize/phazon = 1, + /obj/random/mech_toy = 1, /obj/item/weapon/reagent_containers/spray/waterflower = 1, /obj/random/action_figure = 1, /obj/random/plushie = 1, diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index e06c9dbc00..7873f78a60 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -425,6 +425,15 @@ return ..() +/obj/random/mech_toy + name = "Random Mech Toy" + desc = "This is a random mech toy." + icon = 'icons/obj/toy.dmi' + icon_state = "ripleytoy" + +/obj/random/mech_toy/item_to_spawn() + return pick(typesof(/obj/item/toy/prize)) + /obj/item/toy/prize/ripley name = "toy ripley" desc = "Mini-Mecha action figure! Collect them all! 1/11."