From c860a797fdc038f302e357d199a08cbb8518b968 Mon Sep 17 00:00:00 2001 From: Cydia Date: Thu, 24 Jan 2019 22:28:28 -0600 Subject: [PATCH] Adds a Lamp Plushie Little lamp plushie, click clack. --- code/game/objects/items/plushes.dm | 8 ++++++++ icons/obj/plushes.dmi | Bin 5691 -> 6063 bytes .../code/modules/client/loadout/backpack.dm | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 9b109b5342..9de2f86eb5 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -517,6 +517,14 @@ icon_state = "plushie_awake" item_state = "plushie_awake" +/obj/item/toy/plush/lampplushie + name = "lamp plushie" + desc = "A toy lamp plushie, doesn't actually make light, but it still toggles on and off. Click clack!" + icon_state = "plushie_lamp" + item_state = "plushie_lamp" + attack_verb = list("lit", "flickered", "flashed") + squeak_override = list('sound/weapons/magout.ogg' = 1) + /obj/item/toy/plush/awakenedplushie/ComponentInitialize() . = ..() AddComponent(/datum/component/edit_complainer) diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 0bf89ab744679d93ab85072431ed9bc2f16a92a0..ac0a72114d9d112dd68898d34e9c03649f5c2493 100644 GIT binary patch literal 6063 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 diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index b3a59425a9..920fbf7b1a 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -18,6 +18,11 @@ category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/slimeplushie +/datum/gear/plushlamp + name = "Lamp plushie" + category = SLOT_IN_BACKPACK + path = /obj/item/toy/plush/lampplushie + /datum/gear/tennis name = "Classic Tennis Ball" category = SLOT_IN_BACKPACK