diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7a79329ab8d..e403761da8b 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -42,7 +42,8 @@ /obj/item/weapon/id_decal/emag = 2, /obj/item/weapon/spellbook/oneuse/fake_gib = 2, /obj/item/toy/foamblade = 2, - /obj/item/toy/flash = 2 + /obj/item/toy/flash = 2, + /obj/item/toy/minigibber = 2 ) /obj/machinery/computer/arcade/power_change() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 2b76b4750a3..937ef75df2f 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -7,15 +7,16 @@ * Toy crossbow * Toy Tommy Gun * Toy swords - * Toy mechs + * Toy mechs * Snap pops * Water flower * Toy Nuke * Card Deck - * Therapy dolls - * Toddler doll - * Inflatable duck + * Therapy dolls + * Toddler doll + * Inflatable duck * Foam armblade + * Mini Gibber */ @@ -1277,4 +1278,45 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/pet_rock/roxie name = "roxie" desc = "Roxie, the bestest girl pet in the whole wide universe!" - icon_state = "roxie" \ No newline at end of file + icon_state = "roxie" + +//minigibber, so cute + +/obj/item/toy/minigibber + name = "miniature gibber" + desc = "A miniature recreation of NanoTrasen's famous meat grinder." + icon = 'icons/obj/toy.dmi' + icon_state = "minigibber" + attack_verb = list("grinded", "gibbed") + w_class = 2.0 + var/cooldown = 0 + var/obj/stored_minature = null + +/obj/item/toy/minigibber/attack_self(var/mob/user) + + if(stored_minature) + user << "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!" + qdel(stored_minature) + stored_minature = null + playsound(user, 'sound/effects/gib.ogg', 20, 1) + cooldown = world.time + + if(cooldown < world.time - 8) + user << "You hit the gib button on \the [src]." + playsound(user, 'sound/effects/gib.ogg', 20, 1) + cooldown = world.time + +/obj/item/toy/minigibber/attackby(var/obj/O, var/mob/user, params) + if(istype(O,/obj/item/toy/character) && O.loc == user) + user << "You start feeding \the [O] \icon[O] into \the [src]'s mini-input." + if(do_after(user,10)) + if(O.loc != user) + user << "\The [O] is too far away to feed into \the [src]!" + else + user << "You feed \the [O] \icon[O] into \the [src]!" + user.unEquip(O) + O.forceMove(src) + stored_minature = O + else + user << "You stop feeding \the [O] into \the [src]'s mini-input." + else ..() \ No newline at end of file diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm index 39629f10131..f578e17bab2 100644 --- a/code/modules/store/items.dm +++ b/code/modules/store/items.dm @@ -75,6 +75,12 @@ typepath = /obj/item/weapon/storage/fancy/candle_box/full cost = 200 +/datum/storeitem/minigibber + name = "miniature gibber" + desc = "A miniature recreation of NanoTrasen's famous meat grinder." + typepath = /obj/item/toy/minigibber + cost = 400 + /datum/storeitem/katana name = "replica katana" desc = "Woefully underpowered in D20." diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index 0bd2935fe91..4cf08668bee 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ