From 98eca2a4a656a509bd4a46e61bd3c84854ab574e Mon Sep 17 00:00:00 2001 From: "polyxenitopalidou@gmail.com" Date: Thu, 10 May 2012 18:11:21 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A2Contraband=20supply=20packs=20now=20co?= =?UTF-8?q?ntain=20the=20DreadoryCobullshit=20cigarettes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pete, read the comments, the contraband crate is supposed to be a random-assortment-of-goodies pack, and will gradually add more contraband to it. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3573 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/supplypacks.dm | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 4786764e63a..f06b7cee68d 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -580,12 +580,12 @@ ..() -/datum/supply_packs/poster - contains = list("/obj/item/weapon/contraband/poster",) //We randomly pick 5 items from this list through the constructor, look below - name = "Poster crate" +/datum/supply_packs/contraband + contains = list("/obj/item/weapon/contraband/poster","/obj/item/weapon/cigpacket/dromedaryco") //We randomly pick 5 items from this list through the constructor, look below + name = "Contraband crate" cost = 30 - containertype = "/obj/structure/closet/crate/poster" - containername = "Poster crate" + containertype = "/obj/structure/closet/crate/contraband" + containername = "Contraband crate" contraband = 1 /datum/supply_packs/poster/New() @@ -593,19 +593,4 @@ for(var/i = 0,i<5,i++) tempContains += pick(contains) src.contains = tempContains - ..() - -/datum/supply_packs/cigarettes - contains = list("/obj/item/weapon/cigpacket/dromedaryco", - "/obj/item/weapon/cigpacket/dromedaryco", - "/obj/item/weapon/cigpacket/dromedaryco", - "/obj/item/weapon/cigpacket/dromedaryco", - "/obj/item/weapon/cigpacket/dromedaryco", - "/obj/item/weapon/cigpacket/dromedaryco",) - name = "DromedaryCo cigarettes crate" - cost = 15 - containertype = "/obj/structure/closet/crate/cigarettes" - containername = "DromedaryCo cigarettes crate" - contraband = 1 - -//SUPPLY PACKS \ No newline at end of file + ..() \ No newline at end of file