From 0a318a445f90bb6959b3121e271ce1dc7dbb96e0 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Mon, 23 Nov 2015 21:55:20 -0500 Subject: [PATCH] Makes them spawn randomly in the arcade machines --- code/game/machinery/computer/arcade.dm | 1 + code/game/objects/items/toys.dm | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 12e2df8c7a4..325e01d2c52 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -47,6 +47,7 @@ /obj/item/toy/flash = 2, /obj/item/toy/minigibber = 2, /obj/item/toy/toy_xeno = 2, + /obj/random/figure = 16 ) /obj/machinery/computer/arcade/power_change() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 538ee1b5994..2c11f36ece1 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1448,6 +1448,17 @@ obj/item/toy/cards/deck/syndicate/black * Action Figures */ + +/obj/random/figure + name = "Random Action Figure" + desc = "This is a random toy action figure" + icon = 'icons/obj/toy.dmi' + icon_state = "nuketoy" + +/obj/random/figure/item_to_spawn() + return pick(subtypesof(/obj/item/toy/figure)) + + /obj/item/toy/figure name = "Non-Specific Action Figure action figure" desc = "A \"Space Life\" brand... wait, what the hell is this thing?"