From 2a0fda62ba913da68df1316465f27cb8c16f84f6 Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Tue, 26 Oct 2010 18:44:53 +0000 Subject: [PATCH] Fixed duplicate items in the hydroponics crate. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@355 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/storage/crates.dm | 4 ++-- code/game/supplyshuttle.dm | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/storage/crates.dm b/code/game/objects/storage/crates.dm index 4d851379d7c..b6a11094741 100644 --- a/code/game/objects/storage/crates.dm +++ b/code/game/objects/storage/crates.dm @@ -117,7 +117,7 @@ openicon = "hydrocrateopen" closedicon = "hydrocrate" density = 1 - New() +/* New() // This stuff shouldn't be here, it should be in /datum/supply_packs/hydroponics ..() new /obj/item/weapon/plantbgone(src) new /obj/item/weapon/plantbgone(src) @@ -127,7 +127,7 @@ new /obj/item/weapon/weedspray(src) new /obj/item/weapon/pestspray(src) new /obj/item/weapon/pestspray(src) - new /obj/item/weapon/pestspray(src) + new /obj/item/weapon/pestspray(src) */ /obj/crate/New() ..() diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index ccfdb7faaba..1ab68e16126 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -340,6 +340,8 @@ var/supply_shuttle_points = 50 "/obj/item/weapon/pestspray", "/obj/item/weapon/pestspray", "/obj/item/weapon/pestspray", + "/obj/item/weapon/minihoe", + "/obj/item/device/analyzer/plant_analyzer", "/obj/item/clothing/gloves/latex", "/obj/item/clothing/gloves/latex") // For handling nettles etc cost = 10