From fffd0c57300942271154d5dfb4ae339f1bbedef9 Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Tue, 10 Apr 2012 04:31:14 +0000 Subject: [PATCH] Removes bananaium from resource crates Removes facehuggers until we finally fix the xeno procs, and removes the Wish Granter by Neo's suggestion until later discussion. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3429 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/storage.dm | 29 +++++++++++++++++++++++++++++ code/game/asteroid/artifacts.dm | 6 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 900f900debe..ae61ff93dc5 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -414,6 +414,35 @@ /obj/structure/closet/syndicate/resources/ desc = "It's an emergancy storage closet for repairs." +/obj/structure/closet/syndicate/resources/New() + ..() + + var/list/resources = list( + + /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/glass, + /obj/item/stack/sheet/gold, + /obj/item/stack/sheet/silver, + /obj/item/stack/sheet/plasma, + /obj/item/stack/sheet/uranium, + /obj/item/stack/sheet/diamond, + ///obj/item/stack/sheet/clown, + /obj/item/stack/sheet/plasteel, + /obj/item/stack/rods + ) + + sleep(2) + + for(var/i = 0, i<2, i++) + for(var/res in resources) + var/obj/item/stack/R = new res(src) + R.amount = R.max_amount + + return + +/obj/structure/closet/syndicate/resources/everything + desc = "It's an emergancy storage closet for repairs." + /obj/structure/closet/syndicate/resources/New() ..() diff --git a/code/game/asteroid/artifacts.dm b/code/game/asteroid/artifacts.dm index 04f826d4041..7f4bf9f93a7 100644 --- a/code/game/asteroid/artifacts.dm +++ b/code/game/asteroid/artifacts.dm @@ -1,4 +1,4 @@ -var/global/list/space_surprises = list( /obj/item/clothing/mask/facehugger, +var/global/list/space_surprises = list( // /obj/item/clothing/mask/facehugger, // Just until we finally fix xeno procs /obj/effect/critter/spesscarp, // /obj/effect/critter/spesscarp/elite, // /obj/creature, @@ -10,11 +10,11 @@ var/global/list/space_surprises = list( /obj/item/clothing/mask/facehugger, // /obj/item/weapon/rubber_chicken, /obj/item/weapon/melee/energy/sword/pirate, /obj/structure/closet/syndicate/resources, - /obj/machinery/wish_granter + // /obj/machinery/wish_granter // /obj/item/toy/blink //ALL OF THIS SHIT IS RETARDED, HERE IS SOMETHING APPROPRIATE // /obj/item/toy/ammo/crossbow // HOW THE FUCK IS THAT APPROPRIATE? - ) + ) // Man this list is looking a little bare. var/global/list/spawned_surprises = list()