Merge pull request #7964 from CydiaButt13/lampstuff

Adds a Lamp Plushie
This commit is contained in:
deathride58
2019-01-26 00:05:21 -05:00
committed by GitHub
3 changed files with 13 additions and 0 deletions
+8
View File
@@ -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)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

@@ -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