From 38278e2f58d200e74633f5a2cd8dc37022d1ce61 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 5 May 2016 22:50:46 -0400 Subject: [PATCH] random drugs --- code/game/objects/items/contraband.dm | 30 +- .../reagent_containers/glass/bottle.dm | 2 +- strings/chemistry_tools.json | 473 ++++++++++++++++++ 3 files changed, 489 insertions(+), 16 deletions(-) create mode 100644 strings/chemistry_tools.json diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 22eb55e150e..8bc5b265466 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -29,35 +29,35 @@ new /obj/item/weapon/reagent_containers/food/pill/zoom( src ) new /obj/item/weapon/reagent_containers/food/pill/zoom( src ) - /obj/item/weapon/reagent_containers/food/pill/random_drugs name = "pill" - desc = "" + desc = "A cocktail of illicit designer drugs, who knows what might be in here." /obj/item/weapon/reagent_containers/food/pill/random_drugs/New() ..() 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","vorpal","hardcore","willow", "void","loopy","electro", "cyber","heavy", "ninja", "hydro", "blue", "red", "green", "purple", "strong", "divine","carp" ,"deadly","dead","vicious" ,"wild" ,"demon", "chill", "solid", "liquid", "crazy", "super", "hyper", "space", "wizard", "rainbow", "star", "turbo", "prism", "sticky") + " " + pick("jack","zero","null","beat","nip","bubbles" ,"ice","medicine","venom","shock","solar" ,"spice" ,"shredder", "heart" , "heat", "pill","hopper","scum","fruit", "bolt", "deck", "butter", "runoff", "grease", "flair", "sweat", "zone", "blast") + name = "[pick_list("chemistry_tools.json", "CYBERPUNK_drug_prefixes")] [pick_list("chemistry_tools.json", "CYBERPUNK_drug_suffixes")]" - reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" , "hydrocodone", "psilocybin", "lsd", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) - reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"hydrocodone", "psilocybin", "lsd", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) - reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" , "hydrocodone", "psilocybin", "lsd", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) + var/primaries = rand(1,3) + var/adulterants = rand(2,4) + + while(primaries > 0) + primaries-- + reagents.add_reagent(pick_list("chemistry_tools.json", "CYBERPUNK_drug_primaries"), 6) + while(adulterants > 0) + adulterants-- + reagents.add_reagent(pick_list("chemistry_tools.json", "CYBERPUNK_drug_adulterants"), 3) /obj/item/weapon/storage/pill_bottle/random_drug_bottle - name = "odd pill bottle" - desc = "You're not sure if you trust the contents of this bottle..." + name = "pill bottle (???)" + desc = "Huh." /obj/item/weapon/storage/pill_bottle/random_drug_bottle/New() ..() - new /obj/item/weapon/reagent_containers/food/pill/random_drugs( src ) - new /obj/item/weapon/reagent_containers/food/pill/random_drugs( src ) - new /obj/item/weapon/reagent_containers/food/pill/random_drugs( src ) - new /obj/item/weapon/reagent_containers/food/pill/random_drugs( src ) - new /obj/item/weapon/reagent_containers/food/pill/random_drugs( src ) - new /obj/item/weapon/reagent_containers/food/pill/random_drugs( src ) - new /obj/item/weapon/reagent_containers/food/pill/random_drugs( src ) + for(var/i in 1 to 5) + new /obj/item/weapon/reagent_containers/food/pill/random_drugs(src) diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index b6d28e41276..ca4b15fc211 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -299,7 +299,7 @@ New() ..() - reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide","spidereggs","nanomachines","gibbis","prions"), 40) + reagents.add_reagent(pick_list("chemistry_tools.json", "traitor_poison_bottle"), 40) /obj/item/weapon/reagent_containers/glass/bottle/plasma name = "plasma dust bottle" diff --git a/strings/chemistry_tools.json b/strings/chemistry_tools.json new file mode 100644 index 00000000000..fa154959992 --- /dev/null +++ b/strings/chemistry_tools.json @@ -0,0 +1,473 @@ +{ + "CYBERPUNK_drug_prefixes": [ + "ace", + "acid", + "android", + "angel", + "arse", + "astro", + "atomic", + "azimuth", + "bandit", + "base", + "bear", + "big", + "bit", + "blood", + "blue", + "bog", + "borg", + "bronx", + "buffalo", + "butterfly", + "cactus", + "cancer", + "cat", + "chaos", + "cherub", + "cloud", + "crazy", + "creamy", + "crispy", + "cryo", + "crypto", + "crystal", + "cyber", + "dad's", + "dank", + "dapper", + "dead", + "death", + "deep", + "demon", + "desert", + "devil", + "discharge", + "disco", + "dog", + "dragon", + "duck", + "electro", + "evil", + "exo", + "exotic", + "farty", + "flux", + "flying", + "freak", + "freckle", + "fusion", + "gentlemen's", + "george", + "ghost", + "giga", + "glow", + "goon", + "grandma's", + "hardcore", + "harlem", + "heather", + "heavenly", + "hell", + "hungry", + "hydro", + "ice", + "india", + "iron", + "jazz", + "jelly", + "jersey", + "jungle", + "knockout", + "liquid", + "loony", + "loopy", + "lucky", + "lunar", + "macro", + "mad", + "magic", + "mama's", + "mars", + "marsh", + "mega", + "meteor", + "micro", + "monday", + "monkey", + "moon", + "motor", + "mountain", + "murder", + "naughty", + "necro", + "neon", + "nice", + "night", + "ninja", + "nuke", + "omega", + "omni", + "pain", + "paranoid", + "plasma", + "prism", + "puffer", + "puffy", + "quirky", + "racist", + "rainbow", + "red", + "rift", + "rock", + "rough", + "samurai", + "scan", + "secret", + "shitty", + "sick", + "sicknasty", + "silver", + "sine", + "skull", + "sky", + "slime", + "slimy", + "smooth", + "solar", + "solid", + "space", + "special", + "spotty", + "star", + "sticky", + "stray", + "swamp", + "tachyon", + "tech", + "techno", + "troll", + "turbo", + "turkey", + "uber", + "ultra", + "uncle's", + "uncle", + "unicorn", + "vacuum", + "vampire", + "vile", + "viral", + "void", + "volcano", + "vorpal", + "watt", + "wicked", + "willow", + "wizard", + "wobbly", + "yellow", + "zesty", + "zeta", + "zip", + "zone", + "parrot" + ], + "CYBERPUNK_drug_suffixes": [ + "2000", + "420", + "9", + "99", + "aftershave", + "balls", + "bang", + "bass", + "beans", + "beat", + "beep", + "bees", + "biscuits", + "bit", + "blit", + "blot", + "blue", + "bones", + "boop", + "booster", + "brawn", + "bread", + "bright", + "bubbles", + "bullet", + "burgers", + "butter", + "buttons", + "buzz", + "byte", + "ceramique", + "chasers", + "cheese", + "chill", + "chizz", + "clap", + "coins", + "cooking", + "crack", + "crush", + "dark", + "data", + "diablo", + "dreck", + "drool", + "drugs", + "dust", + "eels", + "eggs", + "fire", + "flash", + "flux", + "giblets", + "goblins", + "gold", + "goop", + "grease", + "green", + "grinder", + "gunge", + "hammer", + "hash", + "hog", + "hook", + "hounds", + "ice", + "ink", + "itch", + "jack", + "jane", + "jerks", + "jones", + "junk", + "kick", + "lasagne", + "lightning", + "lock", + "max", + "meat", + "medicine", + "melons", + "milk", + "mollies", + "mondays", + "music", + "nine", + "nip", + "nuggets", + "nugs", + "null", + "particulars", + "pepper", + "pies", + "ping", + "poofs", + "pot", + "powder", + "puffs", + "punch", + "quake", + "quarks", + "red", + "reef", + "riot", + "ripper", + "runoff", + "saliva", + "sass", + "saturdays", + "sauce", + "scum", + "shaker", + "shank", + "shit", + "shock", + "shredder", + "slurm", + "smash", + "smoke", + "smokes", + "smuds", + "snap", + "snow", + "spank", + "spice", + "spit", + "stank", + "stealth", + "sticks", + "sting", + "stink", + "sundays", + "sushi", + "tango", + "tears", + "theta", + "torpedo", + "tuber", + "turbo", + "volts", + "wafers", + "wave", + "weed", + "white", + "wiggle", + "wisps", + "zap", + "zero", + "zeta", + "zip" + ], + "CYBERPUNK_drug_primaries": [ + "bath_salts", + "crank", + "krokodil", + "methamphetamine", + "lsd", + "psilocybin", + "space_drugs", + "thc", + "jenkem", + "nicotine", + "haloperidol", + "ephedrine", + "epinephrine", + "omnizine", + "morphine", + "ketamine", + "diphenhydramine" + ], + "CYBERPUNK_drug_adulterants": [ + "mercury", + "lithium", + "plasma", + "fuel", + "itching_powder", + "capsaicin", + "histamine", + "ethanol", + "diethylamine", + "atrazine", + "clf3", + "aluminum", + "sugar", + "soybeanoil", + "hydrogenated_soybeanoil", + "phlogiston", + "cryostylane", + "toxin", + "neurotoxin2", + "sulfur", + "saltpetre", + "cyanide", + "formaldehyde", + "sacid", + "facid", + "lipolicide", + "mutagen", + "pancuronium", + "radium", + "uranium", + "polonium", + "sodium_thiopental", + "triplepiss", + "hairgrownium", + "iron", + "sulfonal", + "glowing_slurry", + "toxic_slurry", + "carpet", + "oil", + "ammonia", + "acetone", + "ectoplasm", + "fungus", + "cleaner", + "blood", + "ash", + "synthflesh", + "toiletwater", + "porktonium", + "corn_starch", + "corn_syrup", + "vhfcs", + "gravy", + "msg", + "egg", + "????", + "suicider", + "moonshine", + "prions", + "grave_dust", + "nanomachines", + "chlorine", + "fluorine" + ], + "CYBERPUNK_drug_adulterants_safe": [ + "mercury", + "lithium", + "plasma", + "fuel", + "capsaicin", + "ethanol", + "diethylamine", + "atrazine", + "aluminum", + "sugar", + "soybeanoil", + "phlogiston", + "cryostylane", + "sulfur", + "saltpetre", + "lipolicide", + "triplepiss", + "hairgrownium", + "iron", + "sulfonal", + "carpet", + "oil", + "ammonia", + "acetone", + "ectoplasm", + "fungus", + "cleaner", + "blood", + "ash", + "synthflesh", + "toiletwater", + "corn_starch", + "corn_syrup", + "gravy", + "msg", + "egg", + "????", + "chlorine", + "fluorine" + ], + "traitor_poison_bottle": [ + "sarin", + "cyanide", + "sulfonal", + "initropidril", + "coniine", + "venom", + "ketamine", + "amanitin", + "polonium", + "curare", + "pancuronium", + "sodium_thiopental", + "gibbis", + "nanomachines", + "prions", + "spidereggs", + "concentrated_initro" + ] +} \ No newline at end of file