From 98fd743f6dccadef20f774ef0ec1f5f73d5e25b0 Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Fri, 3 Apr 2015 17:15:07 -0400 Subject: [PATCH] Adds Poster Supply Packs --- code/datums/supplypacks.dm | 16 ++++++++++++---- code/game/objects/effects/decals/contraband.dm | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 025ef1610f2..8d0d0b77859 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1123,13 +1123,23 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/reagent_containers/glass/paint/black, /obj/item/weapon/reagent_containers/glass/paint/white, /obj/item/weapon/reagent_containers/glass/paint/remover, - /obj/item/weapon/contraband/poster, + /obj/item/weapon/contraband/poster/legit, /obj/item/stack/wrapping_paper, /obj/item/stack/wrapping_paper, /obj/item/stack/wrapping_paper) cost = 10 containername = "Arts and Crafts crate" +/datum/supply_packs/misc/posters + name = "Corporate Posters Crate" + contains = list(/obj/item/weapon/contraband/poster/legit, + /obj/item/weapon/contraband/poster/legit, + /obj/item/weapon/contraband/poster/legit, + /obj/item/weapon/contraband/poster/legit, + /obj/item/weapon/contraband/poster/legit) + cost = 8 + containername = "Corporate Posters Crate" + ///////////// Janitor Supplies /datum/supply_packs/misc/janitor @@ -1246,9 +1256,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/randomised/contraband num_contained = 5 - contains = list(/obj/item/weapon/storage/pill_bottle/zoom, - /obj/item/weapon/storage/pill_bottle/happy, - /obj/item/weapon/storage/pill_bottle/random_drug_bottle, + contains = list(/obj/item/weapon/storage/pill_bottle/random_drug_bottle, /obj/item/weapon/contraband/poster, /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, /obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index a5a8f2d958d..4a51e7df7e9 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -156,7 +156,7 @@ obj/structure/sign/poster/New(serial,subtype) desc += " Borg Fancy, Now only taking the most fancy." if(22) name += " - Kosmicheskaya Stantsiya 13 Does Not Exist" - desc += " A poster denying the existence of the derelict station near Space Station 13." + desc += " A poster denying the existence of the derelict station near [station_name()]." if(23) name += " - Rebels Unite!" desc += " A poster telling the viewer to rebel against Nanotrasen."