Merge pull request #126 from SamCroswell/master

Random Drug Pills / CentComm tweaks
This commit is contained in:
ZomgPonies
2014-01-22 20:12:20 -08:00
2 changed files with 3732 additions and 3706 deletions
+37 -1
View File
@@ -27,4 +27,40 @@
new /obj/item/weapon/reagent_containers/pill/zoom( src )
new /obj/item/weapon/reagent_containers/pill/zoom( src )
new /obj/item/weapon/reagent_containers/pill/zoom( src )
new /obj/item/weapon/reagent_containers/pill/zoom( src )
new /obj/item/weapon/reagent_containers/pill/zoom( src )
/obj/item/weapon/reagent_containers/pill/random_drugs
name = "pill"
desc = ""
/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")
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", "thunder", "fire", "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")
reagents.add_reagent(pick("capsaicin", "tricordrazine","neurotoxin","frostoil", "toxin","stoxin", "carpotoxin", "hippiesdelight","condensedcapsaicin","hyperzine","impedrezene" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "chloralhydrate", "space_drugs","holywater" , "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","holywater" , "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","holywater" , "inaprovaline", "serotrotium"), pick(3,5,7,10,15))
/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..."
/obj/item/weapon/storage/pill_bottle/random_drug_bottle/New()
..()
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )
new /obj/item/weapon/reagent_containers/pill/random_drugs( src )