From 1d2fb1491fbc3d8dfd0722efcc9a2ba4d8a28fbd Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 19 Jun 2014 17:52:03 +0400 Subject: [PATCH] Adds 3 office clutter items. Conflicts: code/defines/obj/weapon.dm --- code/defines/obj/weapon.dm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 8f4da575a73..b903bf11b4b 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -878,3 +878,23 @@ proc result.Insert(temp, "[angle]") return result*/ + + +/obj/item/weapon/fan + name = "desk fan" + icon = 'icons/obj/decorations.dmi' + icon_state = "fan" + desc = "A smal desktop fan. Button seems to be stuck in the 'on' position." + +/obj/item/weapon/newton + name = "newton cradle" + icon = 'icons/obj/decorations.dmi' + icon_state = "newton" + desc = "A device bored paper pushers use to remind themselves that the time did not stop yet. Contains gravity." + +/obj/item/weapon/balltoy + name = "ball toy" + icon = 'icons/obj/decorations.dmi' + icon_state = "rollball" + desc = "A device bored paper pushers use to remind themselves that the time did not stop yet." +