From f59fa5474e015541539d40d11348fc4d268bc74b Mon Sep 17 00:00:00 2001 From: SamCroswell Date: Thu, 23 Jan 2014 18:01:41 -0500 Subject: [PATCH] Contraband Crate Changes, Minor Drug Tweaks More little tweaks to the random drugs, added actual contraband to the contraband crate. Maybe people will have a reason to buy it now, eh? --- code/datums/supplypacks.dm | 17 ++++++++++++----- code/game/objects/items/contraband.dm | 10 +++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 36363baa448..611f5ce8ae9 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -339,7 +339,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/seeds/amanitamycelium, /obj/item/seeds/reishimycelium, /obj/item/seeds/bananaseed, - /obj/item/seeds/eggyseed) + /obj/item/seeds/eggyseed, + /obj/item/seeds/bloodtomatoseed) cost = 15 containertype = /obj/structure/closet/crate/hydroponics containername = "Exotic Seeds crate" @@ -818,11 +819,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee group = "Operations" /datum/supply_packs/randomised/contraband - num_contained = 5 - contains = list(/obj/item/seeds/bloodtomatoseed, - /obj/item/weapon/storage/pill_bottle/zoom, + num_contained = 6 + contains = list(/obj/item/weapon/storage/pill_bottle/zoom, /obj/item/weapon/storage/pill_bottle/happy, - /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe) + /obj/item/weapon/storage/pill_bottle/random_drug_bottle, + /obj/item/weapon/storage/fancy/cigarettes/dromedaryco, + /obj/item/weapon/grenade/smokebomb, + /obj/item/clothing/mask/cigarette/cigar/cohiba, + /obj/item/weapon/reagent_containers/food/drinks/cans/ale, + /obj/item/weapon/reagent_containers/food/drinks/bottle/patron, + /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, + /obj/item/weapon/lipstick/random) name = "Contraband crate" cost = 30 diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 78b7e4892b3..8050bbb82a0 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -36,13 +36,13 @@ /obj/item/weapon/reagent_containers/pill/random_drugs/New() ..() - icon_state = "pill" + pick("1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20") + icon_state = "pill" + pick("2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20") - name = pick("lunar","hardcore","willow", "void","loopy","electro", "cyber","heavy", "ninja", "hydro", "blue", "red", "green", "purple", "strong", "divine","carp" ,"deadly","vicious" ,"wild" ,"demon", "chill", "solid", "liquid", "crazy", "super", "hyper", "space", "wizard", "rainbow", "star", "turbo", "prism", "sticky") + " " + pick("jack","null","beat","diablo","nip","bubbles" ,"ice","medicine","venom" ,"spice" ,"shredder", "heart" , "heat", "pill","hopper","scum","fruit", "bolt", "deck", "butter", "runoff", "grease", "flair", "sweat", "zone", "blast") + name = pick("lunar","hardcore","willow", "void","loopy","electro", "cyber","heavy", "ninja", "hydro", "blue", "red", "green", "purple", "strong", "divine","carp" ,"deadly","vicious" ,"wild" ,"demon", "chill", "solid", "liquid", "crazy", "super", "hyper", "space", "wizard", "rainbow", "star", "turbo", "prism", "sticky") + " " + pick("jack","null","beat","nip","bubbles" ,"ice","medicine","venom" ,"spice" ,"shredder", "heart" , "heat", "pill","hopper","scum","fruit", "bolt", "deck", "butter", "runoff", "grease", "flair", "sweat", "zone", "blast") - reagents.add_reagent(pick("capsaicin", "tricordrazine","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","condensedcapsaicin","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "chloralhydrate", "space_drugs" , "inaprovaline", "serotrotium"), pick(3,5,7,10,15)) - reagents.add_reagent(pick("capsaicin", "tricordrazine","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","condensedcapsaicin","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "chloralhydrate", "space_drugs" , "inaprovaline", "serotrotium"), pick(3,5,7,10,15)) - reagents.add_reagent(pick("capsaicin", "tricordrazine","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","condensedcapsaicin","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "chloralhydrate", "space_drugs" , "inaprovaline", "serotrotium"), pick(3,5,7,10,15)) + reagents.add_reagent(pick("chloralhydrate","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "inaprovaline", "serotrotium"), pick(5,7,10,13,15)) + reagents.add_reagent(pick("chloralhydrate","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "inaprovaline", "serotrotium"), pick(5,7,10,13,15)) + reagents.add_reagent(pick("chloralhydrate","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "inaprovaline", "serotrotium"), pick(5,7,10,13,15))