From 6fb2e86a5ca15bb5013bce8db714b57fab8f1787 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Tue, 5 Apr 2011 16:25:52 +0000 Subject: [PATCH] The fake syndicate suit can hold toys in its suit storage. Cap guns can be recycled like cap gun ammo boxes. So once you empty your 14 shots, toss the gun and box in the autolathe for 10 metal and 10 glass points a piece. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1380 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing/suit.dm | 2 +- code/defines/obj/toy.dm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 72218cdd764..a0683fc6dd2 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -337,7 +337,7 @@ desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!" w_class = 3 flags = FPRINT | TABLEPASS | ONESIZEFITSALL - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy) /obj/item/clothing/suit/space/nasavoid name = "NASA Voidsuit" diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index a35d2e9c1b2..7f8162624fc 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -24,7 +24,7 @@ obj/item/toy/blink update_icon() src.icon_state = text("357-[]", src.amount_left) - src.desc = text("There are [] caps\s left! Make sure to recyle the box when it gets empty.", src.amount_left) + src.desc = text("There are [] caps\s left! Make sure to recycle the box in your local autolathe when it gets empty.", src.amount_left) return /obj/item/toy/ammo/crossbow @@ -45,12 +45,14 @@ obj/item/toy/blink /obj/item/toy/gun name = "cap gun" - desc = "There are 0 caps left. Looks almost like the real thing! Ages 8 and up." + desc = "There are 0 caps left. Looks almost like the real thing! Ages 8 and up. Please recycle in your local autolathe when your out of caps!" icon = 'gun.dmi' icon_state = "revolver" item_state = "gun" flags = FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY w_class = 3.0 + g_amt = 10 + m_amt = 10 var/bullets = 7.0 examine()