cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chemical Improvements & Tweaks: Side-effects, overdoses, and more. (#9708)

Browse Source
This commit is contained in:
sadkermit
2020-09-01 13:29:40 +01:00
committed by GitHub
parent 47fbd436df
commit 36dc8a5220
30 changed files with 727 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/reagents/reagent_containers/glass/bottle.dm
View File

@@ -11,7 +11,7 @@
)
icon_state = null
item_state = "bottle"
amount_per_transfer_from_this = 10
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5,10,15,25,30,60)
flags = 0
volume = 60
@@ -97,6 +97,12 @@
icon_state = "bottle-4"
reagents_to_add = list(/datum/reagent/dylovene = 60)
/obj/item/reagent_containers/glass/bottle/saline
name = "saline bottle"
desc = "A small bottle of saline for attaching to drips. Re-hydrates a patient and helps with increasing blood volume."
icon_state = "bottle-3"
reagents_to_add = list(/datum/reagent/saline = 60)
/obj/item/reagent_containers/glass/bottle/mutagen
name = "unstable mutagen bottle"
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."

12
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -168,13 +168,21 @@
update_icon()
return
/obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone
name = "sideeffects-be-gone! autoinjector"
desc = "A special cocktail designed to counter the side-effects of various drugs. Has 2 uses."
volume = 30
amount_per_transfer_from_this = 15
reagents_to_add = list(/datum/reagent/synaptizine = 5, /datum/reagent/cetahydramine = 10, /datum/reagent/oculine = 5, /datum/reagent/ethylredoxrazine = 10)
/obj/item/reagent_containers/hypospray/autoinjector/stimpack
name = "stimpack"
desc = "A simple chemical cocktail of hyperzine and mortaphenyl designed to boost efficiency by 6,000% (estimated). Hoo-rah!"
volume = 20
amount_per_transfer_from_this = 20
reagents_to_add = list(/datum/reagent/hyperzine = 12, /datum/reagent/mortaphenyl = 8)
reagents_to_add = list(/datum/reagent/hyperzine = 12, /datum/reagent/mortaphenyl = 6, /datum/reagent/synaptizine = 2)
/obj/item/reagent_containers/hypospray/autoinjector/survival
name = "survival autoinjector"
@@ -182,7 +190,7 @@
volume = 35
amount_per_transfer_from_this = 35
reagents_to_add = list(/datum/reagent/tricordrazine = 15, /datum/reagent/inaprovaline = 5, /datum/reagent/dexalin/plus = 5, /datum/reagent/oxycomorphine = 5, /datum/reagent/mental/corophenidate = 5)
reagents_to_add = list(/datum/reagent/tricordrazine = 15, /datum/reagent/inaprovaline = 5, /datum/reagent/dexalin/plus = 5, /datum/reagent/oxycomorphine = 3, /datum/reagent/synaptizine = 2, /datum/reagent/mental/corophenidate = 5)
/obj/item/reagent_containers/hypospray/combat
name = "combat hypospray"

93
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -87,122 +87,133 @@
//Pills
/obj/item/reagent_containers/pill/antitox
name = "anti-toxins pill"
name = "Anti-toxins Pill"
desc = "Neutralizes many common toxins."
icon_state = "pill17"
reagents_to_add = list(/datum/reagent/dylovene = 25)
reagents_to_add = list(/datum/reagent/dylovene = 10)
/obj/item/reagent_containers/pill/tox
name = "toxins pill"
name = "Toxins Pill"
desc = "Highly toxic."
icon_state = "pill5"
reagents_to_add = list(/datum/reagent/toxin = 50)
/obj/item/reagent_containers/pill/cyanide
name = "cyanide pill"
name = "Cyanide Pill"
desc = "Don't swallow this."
icon_state = "pill5"
reagents_to_add = list(/datum/reagent/toxin/cyanide = 50)
/obj/item/reagent_containers/pill/adminordrazine
name = "adminordrazine pill"
name = "Adminordrazine Pill"
desc = "It's magic. We don't have to explain it."
icon_state = "pill16"
reagents_to_add = list(/datum/reagent/adminordrazine = 50)
/obj/item/reagent_containers/pill/stox
name = "sleeping pill"
name = "Sleeping Pill"
desc = "Commonly used to treat insomnia."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/soporific = 15)
/obj/item/reagent_containers/pill/kelotane
name = "kelotane pill"
desc = "Used to treat burns."
name = "Kelotane Pill"
desc = "Used to treat minor burns."
icon_state = "pill11"
reagents_to_add = list(/datum/reagent/kelotane = 15)
reagents_to_add = list(/datum/reagent/kelotane = 10)
/obj/item/reagent_containers/pill/perconol
name = "perconol pill"
desc = "A painkiller for the ages. Chewables!"
name = "Perconol Pill"
desc = "A light painkiller available over-the-counter."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/perconol = 15)
reagents_to_add = list(/datum/reagent/perconol = 10)
/obj/item/reagent_containers/pill/mortaphenyl
name = "mortaphenyl pill"
name = "Mortaphenyl Pill"
desc = "A mortaphenyl pill, it's a potent painkiller."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mortaphenyl = 15)
reagents_to_add = list(/datum/reagent/mortaphenyl = 10)
/obj/item/reagent_containers/pill/corophenidate
name = "corophenidate pill"
name = "Corophenidate Pill"
desc = "Improves the ability to concentrate."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/corophenidate = 15)
reagents_to_add = list(/datum/reagent/mental/corophenidate = 5)
/obj/item/reagent_containers/pill/minaphobin
name = "minaphobin pill"
desc = "Mild anti-depressant."
name = "Minaphobin Pill"
desc = "Used to treat anxiety disorders and depression."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/minaphobin = 15)
reagents_to_add = list(/datum/reagent/mental/minaphobin = 5)
/obj/item/reagent_containers/pill/inaprovaline
name = "inaprovaline pill"
desc = "Used to stabilize patients."
name = "Inaprovaline Pill"
desc = "Used to stabilize heart activity."
icon_state = "pill20"
reagents_to_add = list(/datum/reagent/inaprovaline = 30)
reagents_to_add = list(/datum/reagent/inaprovaline = 10)
/obj/item/reagent_containers/pill/dexalin
name = "dexalin pill"
name = "Dexalin Pill"
desc = "Used to treat oxygen deprivation."
icon_state = "pill16"
reagents_to_add = list(/datum/reagent/dexalin = 15)
/obj/item/reagent_containers/pill/dexalin_plus
name = "dexalin Plus pill"
name = "Dexalin Plus Pill"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/dexalin/plus = 15)
/obj/item/reagent_containers/pill/dermaline
name = "dermaline pill"
desc = "Used to treat burn wounds."
name = "Dermaline Pill"
desc = "Used to treat severe burn wounds."
icon_state = "pill12"
reagents_to_add = list(/datum/reagent/dermaline = 15)
reagents_to_add = list(/datum/reagent/dermaline = 10)
/obj/item/reagent_containers/pill/dylovene
name = "dylovene pill"
name = "Dylovene Pill"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill13"
reagents_to_add = list(/datum/reagent/dylovene = 15)
/obj/item/reagent_containers/pill/bicaridine
name = "bicaridine pill"
desc = "Used to treat physical injuries."
/obj/item/reagent_containers/pill/butazoline
name = "Butazoline Pill"
desc = "Used to treat major injuries and bleeding."
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/bicaridine = 20)
reagents_to_add = list(/datum/reagent/butazoline = 10)
/obj/item/reagent_containers/pill/bicaridine
name = "Bicaridine Pill"
desc = "Used to treat minor injuries and bleeding."
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/bicaridine = 10)
/obj/item/reagent_containers/pill/happy
name = "happy pill"
name = "Happy Pill"
desc = "Happy happy joy joy!"
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/space_drugs = 15, /datum/reagent/sugar = 15)
/obj/item/reagent_containers/pill/zoom
name = "zoom pill"
name = "Zoom Pill"
desc = "Zoooom!"
icon_state = "pill18"
reagents_to_add = list(/datum/reagent/impedrezene = 10, /datum/reagent/synaptizine = 5, /datum/reagent/hyperzine = 5)
obj/item/reagent_containers/pill/tranquility
name = "Tranquility Pill"
desc = "Peace, at last."
icon_state = "pill8"
reagents_to_add = list(/datum/reagent/mental/neurapan = 15, /datum/reagent/impedrezene = 10)
/obj/item/reagent_containers/pill/thetamycin
name = "thetamycin pill"
desc = "Contains theta-lactam antibiotics."
name = "Thetamycin Pill"
desc = "Used to treat infections and septicaemia."
icon_state = "pill19"
reagents_to_add = list(/datum/reagent/thetamycin = 15)
/obj/item/reagent_containers/pill/bio_vitamin
name = "vitamin pill"
name = "Vitamin Pill"
desc = "Contains a meal's worth of nutrients."
icon_state = "pill11"
reagents_to_add = list(/datum/reagent/nutriment = 20)
@@ -212,13 +223,13 @@
. = ..()
/obj/item/reagent_containers/pill/rmt
name = "regenerative-muscular tissue supplement pill"
name = "Regenerative-Muscular Tissue Supplement Pill"
desc = "Commonly abbreviated to RMT, it contains chemicals rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations."
icon_state = "pill19"
reagents_to_add = list(/datum/reagent/rmt = 15)
/obj/item/reagent_containers/pill/cetahydramine
name = "cetahydramine pill"
desc = "Contains modern Cetahydramine, often compared to ancient Benadryl. Helps with sneezing, can cause drowsiness."
name = "Cetahydramine Pill"
desc = "Used to treat coughing, sneezing and itching."
icon_state = "pill19"
reagents_to_add = list(/datum/reagent/cetahydramine = 5)