From 3f0eb4836f28f0cd1672f8374244cf8ae8f21e25 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 15 Nov 2012 17:17:56 +0400 Subject: [PATCH 01/78] Ported some crate types frpm pre-merge. Moved posters to arts crate and lipstick with cigs to party crate. Contraband crate now has killer tomato seeds, illegal booze and drugs. --- baystation12.dme | 2 + code/datums/supplypacks.dm | 82 ++++++++++++++++++- .../game/objects/effects/decals/contraband.dm | 2 +- .../reagent_containers/food/drinks/bottle.dm | 8 ++ .../reagents/reagent_containers/pill.dm | 19 +++++ 5 files changed, 108 insertions(+), 5 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 35771b67a2..a9c9539a92 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -638,6 +638,7 @@ #include "code\game\objects\weapons.dm" #include "code\game\objects\closets\walllocker.dm" #include "code\game\objects\effects\aliens.dm" +#include "code\game\objects\effects\barsign.dm" #include "code\game\objects\effects\biomass_rift.dm" #include "code\game\objects\effects\bump_teleporter.dm" #include "code\game\objects\effects\effect_system.dm" @@ -668,6 +669,7 @@ #include "code\game\objects\items\blueprints.dm" #include "code\game\objects\items\bodybag.dm" #include "code\game\objects\items\candle.dm" +#include "code\game\objects\items\contraband.dm" #include "code\game\objects\items\crayons.dm" #include "code\game\objects\items\latexballoon.dm" #include "code\game\objects\items\shooting_range.dm" diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index fa5b43e69c..437dbc6c9b 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -16,6 +16,7 @@ var/access = null var/hidden = 0 var/contraband = 0 + var/group /datum/supply_packs/New() manifest += "