mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-25 17:02:04 +00:00
1148bde3a6
Ok, messed up resolving the merge conflicts (first try), so doing a fresh pr. This turned out to be a good thing, as after I put the changes back I tested again, and found 2 bugs (not due to my code) Firstly, the organ refactor had introduced a bug when taking liver damage from being drunk. It wasn't getting the liver correctly, leaving it with null, and was then trying to damage it. The second was related to the amount you took in when drinking
64 lines
3.7 KiB
Plaintext
64 lines
3.7 KiB
Plaintext
//Let's get some REAL contraband stuff in here. Because come on, getting brigged for LIPSTICK is no fun.
|
|
|
|
//Illicit drugs~
|
|
/obj/item/weapon/storage/pill_bottle/happy
|
|
name = "Happy pills"
|
|
desc = "Highly illegal drug. When you want to see the rainbow."
|
|
|
|
/obj/item/weapon/storage/pill_bottle/happy/New()
|
|
..()
|
|
new /obj/item/weapon/reagent_containers/food/pill/happy( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/happy( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/happy( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/happy( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/happy( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/happy( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/happy( src )
|
|
|
|
/obj/item/weapon/storage/pill_bottle/zoom
|
|
name = "Zoom pills"
|
|
desc = "Highly illegal drug. Trade brain for speed."
|
|
|
|
/obj/item/weapon/storage/pill_bottle/zoom/New()
|
|
..()
|
|
new /obj/item/weapon/reagent_containers/food/pill/zoom( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/zoom( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/zoom( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/zoom( src )
|
|
new /obj/item/weapon/reagent_containers/food/pill/zoom( src )
|
|
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 = ""
|
|
|
|
/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")
|
|
|
|
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))
|
|
|
|
|
|
|
|
/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/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 )
|
|
|
|
|