cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-11 18:11:06 -07:00
committed by GitHub
parent d5b62d4159
commit fd5d9267ff
622 changed files with 11273 additions and 9558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/reagent_containers/blood_pack.dm
View File

@@ -27,7 +27,7 @@
var/label_text = ""
var/blood_type = null
var/reag_id = "blood"
var/reag_id = REAGENT_ID_BLOOD
/obj/item/reagent_containers/blood/Initialize()
. = ..()
@@ -98,11 +98,11 @@
/obj/item/reagent_containers/blood/synthplas
blood_type = "O-"
reag_id = "synthblood_dilute"
reag_id = REAGENT_ID_SYNTHBLOOD_DILUTE
/obj/item/reagent_containers/blood/synthblood
blood_type = "O-"
reag_id = "synthblood"
reag_id = REAGENT_ID_SYNTHBLOOD
/obj/item/reagent_containers/blood/empty
name = "Empty BloodPack"

2
code/modules/reagents/reagent_containers/blood_pack_vr.dm
View File

@@ -4,7 +4,7 @@
var/remove_volume = volume* 0.1 //10% of what the bloodpack can hold.
var/reagent_to_remove = reagents.get_master_reagent_id()
switch(reagents.get_master_reagent_id())
if("blood")
if(REAGENT_ID_BLOOD)
user.show_message(span_warning("You sink your fangs into \the [src] and suck the blood out of it!"))
user.visible_message(span_red("[user] sinks their fangs into \the [src] and drains it!"))
user.adjust_nutrition(remove_volume*5)

98
code/modules/reagents/reagent_containers/borghypo.dm
View File

@@ -14,25 +14,25 @@
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/bypass_protection = FALSE // If true, can inject through things like spacesuits and armor.
var/list/reagent_ids = list("tricordrazine", "inaprovaline", "bicaridine", "anti_toxin", "kelotane", "tramadol", "dexalin" ,"spaceacillin")
var/list/reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_BICARIDINE, REAGENT_ID_ANTITOXIN, REAGENT_ID_KELOTANE, REAGENT_ID_TRAMADOL, REAGENT_ID_DEXALIN, REAGENT_ID_SPACEACILLIN) // CHOMPEdit
var/list/reagent_volumes = list()
var/list/reagent_names = list()
/obj/item/reagent_containers/borghypo/surgeon
reagent_ids = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone")
reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_OXYCODONE)
/obj/item/reagent_containers/borghypo/crisis
reagent_ids = list("inaprovaline", "tricordrazine", "dexalin", "bicaridine", "kelotane", "anti_toxin", "spaceacillin", "tramadol", "adranol") // CHOMPedit: Unifying chems with dogborg equivalent.
reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_DEXALIN, REAGENT_ID_BICARIDINE, REAGENT_ID_KELOTANE, REAGENT_ID_ANTITOXIN, REAGENT_ID_SPACEACILLIN, REAGENT_ID_TRAMADOL, REAGENT_ID_ADRANOL) // CHOMPedit: Unifying chems with dogborg equivalent.
/obj/item/reagent_containers/borghypo/lost
reagent_ids = list("tricordrazine", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_BICARIDINE, REAGENT_ID_DEXALIN, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_SPACEACILLIN)
/obj/item/reagent_containers/borghypo/merc
name = "advanced cyborg hypospray"
desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment. This type is capable of safely bypassing \
thick materials that other hyposprays would struggle with."
bypass_protection = TRUE // Because mercs tend to be in spacesuits.
reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood")
reagent_ids = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD)
/obj/item/reagent_containers/borghypo/Initialize()
. = ..()
@@ -141,50 +141,50 @@
recharge_time = 3
volume = 60
possible_transfer_amounts = list(5, 10, 20, 30)
reagent_ids = list("ale",
"applejuice", //CHOMPADD it has literally every other type of juice..
"beer",
"berryjuice",
"bitters",
"cider",
"coffee",
"cognac",
"cola",
"cream",
"dr_gibb",
"egg",
"gin",
"gingerale",
"hot_coco",
"ice",
"icetea",
"kahlua",
"lemonjuice",
"lemon_lime",
"limejuice",
"mead",
"milk",
"mint",
"orangejuice",
"redwine",
"rum",
"sake",
"sodawater",
"soymilk",
"space_up",
"spacemountainwind",
"spacespice",
"specialwhiskey",
"sugar",
"tea",
"tequilla",
"tomatojuice",
"tonic",
"vermouth",
"vodka",
"water",
"watermelonjuice",
"whiskey")
reagent_ids = list(REAGENT_ID_ALE,
REAGENT_ID_APPLEJUICE, //CHOMPADD it has literally every other type of juice..
REAGENT_ID_BEER,
REAGENT_ID_BERRYJUICE,
REAGENT_ID_BITTERS,
REAGENT_ID_CIDER,
REAGENT_ID_COFFEE,
REAGENT_ID_COGNAC,
REAGENT_ID_COLA,
REAGENT_ID_CREAM,
REAGENT_ID_DRGIBB,
REAGENT_ID_EGG,
REAGENT_ID_GIN,
REAGENT_ID_GINGERALE,
REAGENT_ID_HOTCOCO,
REAGENT_ID_ICE,
REAGENT_ID_ICETEA,
REAGENT_ID_KAHLUA,
REAGENT_ID_LEMONJUICE,
REAGENT_ID_LEMONLIME,
REAGENT_ID_LIMEJUICE,
REAGENT_ID_MEAD,
REAGENT_ID_MILK,
REAGENT_ID_MINT,
REAGENT_ID_ORANGEJUICE,
REAGENT_ID_REDWINE,
REAGENT_ID_RUM,
REAGENT_ID_SAKE,
REAGENT_ID_SODAWATER,
REAGENT_ID_SOYMILK,
REAGENT_ID_SPACEUP,
REAGENT_ID_SPACEMOUNTAINWIND,
REAGENT_ID_SPACESPICE,
REAGENT_ID_SPECIALWHISKEY,
REAGENT_ID_SUGAR,
REAGENT_ID_TEA,
REAGENT_ID_TEQUILLA,
REAGENT_ID_TOMATOJUICE,
REAGENT_ID_TONIC,
REAGENT_ID_VERMOUTH,
REAGENT_ID_VODKA,
REAGENT_ID_WATER,
REAGENT_ID_WATERMELONJUICE,
REAGENT_ID_WHISKEY)
/obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user)
return

4
code/modules/reagents/reagent_containers/food/drinks/bluespacecoffee.dm
View File

@@ -9,9 +9,9 @@
/obj/item/reagent_containers/food/drinks/bluespace_coffee/Initialize()
..()
reagents.add_reagent("coffee", 50)
reagents.add_reagent(REAGENT_ID_COFFEE, 50)
//Infinite Coffee
/obj/item/reagent_containers/food/drinks/bluespace_coffee/attack(mob/M as mob, mob/user as mob, def_zone)
..()
src.reagents.add_reagent("coffee", 50)
src.reagents.add_reagent(REAGENT_ID_COFFEE, 50)

4
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -298,10 +298,10 @@
/obj/item/reagent_containers/glass/beaker/cryoxadone
name = "beaker (cryoxadone)"
prefill = list("cryoxadone" = 30)
prefill = list(REAGENT_ID_CRYOXADONE = 30)
/obj/item/reagent_containers/glass/beaker/sulphuric
prefill = list("sacid" = 60)
prefill = list(REAGENT_ID_SACID = 60)
/obj/item/reagent_containers/glass/beaker/stopperedbottle
name = "stoppered bottle"

82
code/modules/reagents/reagent_containers/glass_vr.dm
View File

@@ -1,86 +1,86 @@
/obj/item/reagent_containers/glass/beaker/neurotoxin
prefill = list("neurotoxin" = 50)
prefill = list(REAGENT_ID_NEUROTOXIN = 50)
/obj/item/reagent_containers/glass/beaker/vial/bicaridine
name = "vial (bicaridine)"
prefill = list("bicaridine" = 30)
name = "vial (" + REAGENT_ID_BICARIDINE + ")"
prefill = list(REAGENT_ID_BICARIDINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dylovene
name = "vial (dylovene)"
prefill = list("dylovene" = 30)
name = "vial (" + REAGENT_ID_ANTITOXIN + ")"
prefill = list(REAGENT_ID_ANTITOXIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dermaline
name = "vial (dermaline)"
prefill = list("dermaline" = 30)
name = "vial (" + REAGENT_ID_DERMALINE + ")"
prefill = list(REAGENT_ID_DERMALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/kelotane
name = "vial (kelotane)"
prefill = list("kelotane" = 30)
name = "vial (" + REAGENT_ID_KELOTANE + ")"
prefill = list(REAGENT_ID_KELOTANE = 30)
/obj/item/reagent_containers/glass/beaker/vial/inaprovaline
name = "vial (inaprovaline)"
prefill = list("inaprovaline" = 30)
name = "vial (" + REAGENT_ID_INAPROVALINE + ")"
prefill = list(REAGENT_ID_INAPROVALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalin
name = "vial (dexalin)"
prefill = list("dexalin" = 30)
name = "vial (" + REAGENT_ID_DEXALIN + ")"
prefill = list(REAGENT_ID_DEXALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalinplus
name = "vial (dexalinp)"
prefill = list("dexalinp" = 30)
name = "vial (" + REAGENT_ID_DEXALINP + ")"
prefill = list(REAGENT_ID_DEXALINP = 30)
/obj/item/reagent_containers/glass/beaker/vial/tricordrazine
name = "vial (tricordrazine)"
prefill = list("tricordrazine" = 30)
name = "vial (" + REAGENT_ID_TRICORDRAZINE + ")"
prefill = list(REAGENT_ID_TRICORDRAZINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/alkysine
name = "vial (alkysine)"
prefill = list("alkysine" = 30)
name = "vial (" + REAGENT_ID_ALKYSINE + ")"
prefill = list(REAGENT_ID_ALKYSINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/imidazoline
name = "vial (imidazoline)"
prefill = list("imidazoline" = 30)
name = "vial (" + REAGENT_ID_IMIDAZOLINE + ")"
prefill = list(REAGENT_ID_IMIDAZOLINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/peridaxon
name = "vial (peridaxon)"
prefill = list("peridaxon" = 30)
name = "vial (" + REAGENT_ID_PERIDAXON + ")"
prefill = list(REAGENT_ID_PERIDAXON = 30)
/obj/item/reagent_containers/glass/beaker/vial/hyronalin
name = "vial (hyronalin)"
prefill = list("hyronalin" = 30)
name = "vial (" + REAGENT_ID_HYRONALIN +")"
prefill = list(REAGENT_ID_HYRONALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/amorphorovir
name = "vial (amorphorovir)"
prefill = list("amorphorovir" = 1)
name = "vial (" + REAGENT_ID_AMORPHOROVIR + ")"
prefill = list(REAGENT_ID_AMORPHOROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/androrovir
name = "vial (androrovir)"
prefill = list("change_drug_male" = 1) //CHOMPEdit
name = "vial (" + REAGENT_ID_ANDROROVIR + ")"
prefill = list(REAGENT_ID_ANDROROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/gynorovir
name = "vial (gynorovir)"
prefill = list("change_drug_female" = 1) //CHOMPEdit
name = "vial (" + REAGENT_ID_GYNOROVIR + ")"
prefill = list(REAGENT_ID_GYNOROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/androgynorovir
name = "vial (androgynorovir)"
prefill = list("change_drug_intersex" = 1) //CHOMPEdit
name = "vial (" + REAGENT_ID_ANDROGYNOROVIR + ")"
prefill = list(REAGENT_ID_ANDROGYNOROVIR = 1)
/obj/item/reagent_containers/glass/beaker/vial/macrocillin
name = "vial (macrocillin)"
prefill = list("macrocillin" = 1)
name = "vial (" + REAGENT_ID_MACROCILLIN + ")"
prefill = list(REAGENT_ID_MACROCILLIN = 1)
/obj/item/reagent_containers/glass/beaker/vial/microcillin
name = "vial (microcillin)"
prefill = list("microcillin" = 1)
name = "vial (" + REAGENT_ID_MICROCILLIN + ")"
prefill = list(REAGENT_ID_MICROCILLIN = 1)
/obj/item/reagent_containers/glass/beaker/vial/normalcillin
name = "vial (normalcillin)"
prefill = list("normalcillin" = 1)
name = "vial (" + REAGENT_ID_NORMALCILLIN + ")"
prefill = list(REAGENT_ID_NORMALCILLIN = 1)
/obj/item/reagent_containers/glass/beaker/vial/supermatter
name = "vial (supermatter)"
name = "vial (" + REAGENT_ID_SUPERMATTER + ")"
desc = "A glass vial containing the extremely dangerous results of grinding a shard of supermatter down to a fine powder."
prefill = list("supermatter" = 5)
prefill = list(REAGENT_ID_SUPERMATTER = 5)
/obj/item/reagent_containers/glass/beaker/measuring_cup
name = "measuring cup"

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

@@ -168,7 +168,7 @@
amount_per_transfer_from_this = 5
volume = 5
filled = 1
filled_reagents = list("inaprovaline" = 5)
filled_reagents = list(REAGENT_ID_INAPROVALINE = 5)
preserve_item = 0
hyposound = 'sound/effects/hypospray.ogg'
@@ -208,18 +208,18 @@
/obj/item/reagent_containers/hypospray/autoinjector/detox
name = "autoinjector (antitox)"
icon_state = "green"
filled_reagents = list("anti_toxin" = 5)
filled_reagents = list(REAGENT_ID_ANTITOXIN = 5)
//Special autoinjectors, while having potent chems like the 15u ones, the chems are usually potent enough that 5u is enough
/obj/item/reagent_containers/hypospray/autoinjector/bonemed
name = "bone repair injector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating damage to bones."
filled_reagents = list("osteodaxon" = 5)
filled_reagents = list(REAGENT_ID_OSTEODAXON = 5)
/obj/item/reagent_containers/hypospray/autoinjector/clonemed
name = "clone injector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating genetic damage."
filled_reagents = list("rezadone" = 5)
filled_reagents = list(REAGENT_ID_REZADONE = 5)
// These have a 15u capacity, somewhat higher tech level, and generally more useful chems, but are otherwise the same as the regular autoinjectors.
/obj/item/reagent_containers/hypospray/autoinjector/biginjector
@@ -229,7 +229,7 @@
amount_per_transfer_from_this = 15
volume = 15
origin_tech = list(TECH_BIO = 4)
filled_reagents = list("inaprovaline" = 15)
filled_reagents = list(REAGENT_ID_INAPROVALINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty //for the autolathe
name = "large autoinjector"
@@ -240,134 +240,134 @@
name = "trauma hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on victims of \
moderate blunt trauma."
filled_reagents = list("bicaridine" = 15)
filled_reagents = list(REAGENT_ID_BICARIDINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn
name = "burn hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on burn victims, \
featuring an optimized chemical mixture to allow for rapid healing."
filled_reagents = list("kelotane" = 7.5, "dermaline" = 7.5)
filled_reagents = list(REAGENT_ID_KELOTANE = 7.5, REAGENT_ID_DERMALINE = 7.5)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin
name = "toxin hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract toxins."
filled_reagents = list("anti_toxin" = 15)
filled_reagents = list(REAGENT_ID_ANTITOXIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy
name = "oxy hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract oxygen \
deprivation."
filled_reagents = list("dexalinp" = 10, "tricordrazine" = 5)
filled_reagents = list(REAGENT_ID_DEXALINP = 10, REAGENT_ID_TRICORDRAZINE = 5)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity
name = "purity hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at \
resolving viruses, infections, radiation, and genetic maladies."
filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, "prussian_blue" = 5, "ryetalyn" = 1)
filled_reagents = list(REAGENT_ID_SPACEACILLIN = 4, REAGENT_ID_ARITHRAZINE = 5, REAGENT_ID_PRUSSIANBLUE = 5, REAGENT_ID_RYETALYN = 1)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain
name = "pain hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one contains potent painkillers."
filled_reagents = list("tramadol" = 15)
filled_reagents = list(REAGENT_ID_TRAMADOL = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ
name = "organ hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. Organ damage is resolved by this variant."
filled_reagents = list("alkysine" = 3, "imidazoline" = 2, "peridaxon" = 10)
filled_reagents = list(REAGENT_ID_ALKYSINE = 3, REAGENT_ID_IMIDAZOLINE = 2, REAGENT_ID_PERIDAXON = 10)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat
name = "combat hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This is a more dangerous and potentially \
addictive hypo compared to others, as it contains a potent cocktail of various chemicals to optimize the recipient's combat \
ability."
filled_reagents = list("bicaridine" = 3, "kelotane" = 1.5, "dermaline" = 1.5, "oxycodone" = 3, "hyperzine" = 3, "tricordrazine" = 3)
filled_reagents = list(REAGENT_ID_BICARIDINE = 3, REAGENT_ID_KELOTANE = 1.5, REAGENT_ID_DERMALINE = 1.5, REAGENT_ID_OXYCODONE = 3, REAGENT_ID_HYPERZINE = 3, REAGENT_ID_TRICORDRAZINE = 3)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting
name = "clotting agent"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at treating bleeding wounds and internal bleeding."
filled_reagents = list("inaprovaline" = 5, "myelamine" = 10)
filled_reagents = list(REAGENT_ID_INAPROVALINE = 5, REAGENT_ID_MYELAMINE = 10)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose
name = "glucose hypo"
desc = "A hypoinjector filled with glucose, used for critically malnourished patients and voidsuited workers."
filled_reagents = list("glucose" = 15)
filled_reagents = list(REAGENT_ID_GLUCOSE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm
name = "stimm injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one is filled with a home-made stimulant, with some serious side-effects."
filled_reagents = list("stimm" = 10) // More than 10u will OD.
filled_reagents = list(REAGENT_ID_STIMM = 10) // More than 10u will OD.
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired
name = "expired injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one has had its contents expire a long time ago, using it now will probably make someone sick, or worse."
filled_reagents = list("expired_medicine" = 15)
filled_reagents = list(REAGENT_ID_EXPIREDMEDICINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific
name = "soporific injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one is sometimes used by orderlies, as it has soporifics, which make someone tired and fall asleep."
filled_reagents = list("stoxin" = 15)
filled_reagents = list(REAGENT_ID_STOXIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide
name = "cyanide injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one contains cyanide, a lethal poison. It being inside a medical autoinjector has certain unsettling implications."
filled_reagents = list("cyanide" = 15)
filled_reagents = list(REAGENT_ID_CYANIDE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium
name = "serotrotium injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one is filled with serotrotium, which causes concentrated production of the serotonin neurotransmitter in humans."
filled_reagents = list("serotrotium" = 15)
filled_reagents = list(REAGENT_ID_SEROTROTIUM = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss
name = "illicit injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one contains various illicit drugs, held inside a hypospray to make smuggling easier."
filled_reagents = list("bliss" = 15)
filled_reagents = list(REAGENT_ID_BLISS = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin
name = "cryptobiolin injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one contains cryptobiolin, which causes confusion."
filled_reagents = list("cryptobiolin" = 15)
filled_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene
name = "impedrezene injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one has impedrezene inside, a narcotic that impairs higher brain functioning. \
This autoinjector is almost certainly created illegitimately."
filled_reagents = list("impedrezene" = 15)
filled_reagents = list(REAGENT_ID_IMPEDREZENE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker
name = "mindbreaker injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This one stores the dangerous hallucinogen called 'Mindbreaker', likely put in place \
by illicit groups hoping to hide their product."
filled_reagents = list("mindbreaker" = 15)
filled_reagents = list(REAGENT_ID_MINDBREAKER = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin
name = "psilocybin injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This has psilocybin inside, which is a strong psychotropic derived from certain species of mushroom. \
This autoinjector likely was made by criminal elements to avoid detection from casual inspection."
filled_reagents = list("psilocybin" = 15)
filled_reagents = list(REAGENT_ID_PSILOCYBIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen
name = "unstable mutagen injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This contains unstable mutagen, which makes using this a very bad idea. It will either \
ruin your genetic health, turn you into a Five Points violation, or both!"
filled_reagents = list("mutagen" = 15)
filled_reagents = list(REAGENT_ID_MUTAGEN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/lexorin
name = "lexorin injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
This contains lexorin, a dangerous toxin that stops respiration, and has been \
implicated in several high-profile assassinations in the past."
filled_reagents = list("lexorin" = 15)
filled_reagents = list(REAGENT_ID_LEXORIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites
name = "medical nanite injector"
@@ -375,7 +375,7 @@
The injector stores a slurry of highly advanced and specialized nanomachines designed \
to restore bodily health from within. The nanomachines are short-lived but degrade \
harmlessly, and cannot self-replicate in order to remain Five Points compliant."
filled_reagents = list("healing_nanites" = 15)
filled_reagents = list(REAGENT_ID_HEALINGNANITES = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites
name = "defective nanite injector"
@@ -383,14 +383,14 @@
The injector stores a slurry of highly advanced and specialized nanomachines that \
are unfortunately malfunctioning, making them unsafe to use inside of a living body. \
Because of the Five Points, these nanites cannot self-replicate."
filled_reagents = list("defective_nanites" = 15)
filled_reagents = list(REAGENT_ID_DEFECTIVENANITES = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated
name = "contaminated injector"
desc = "A refined version of the standard autoinjector, allowing greater capacity. \
The hypospray contains a viral agent inside, as well as a liquid substance that encourages \
the growth of the virus inside."
filled_reagents = list("virusfood" = 15)
filled_reagents = list(REAGENT_ID_VIRUSFOOD = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/do_injection(mob/living/carbon/human/H, mob/living/user)
. = ..()

8
code/modules/reagents/reagent_containers/hypospray_vr.dm
View File

@@ -1,22 +1,22 @@
/obj/item/reagent_containers/hypospray/autoinjector/burn
name = "autoinjector (burn)"
icon_state = "purple"
filled_reagents = list("dermaline" = 3.5, "leporazine" = 1.5)
filled_reagents = list(REAGENT_ID_DERMALINE = 3.5, REAGENT_ID_LEPORAZINE = 1.5)
/obj/item/reagent_containers/hypospray/autoinjector/trauma
name = "autoinjector (trauma)"
icon_state = "black"
filled_reagents = list("bicaridine" = 4, "tramadol" = 1)
filled_reagents = list(REAGENT_ID_BICARIDINE = 4, REAGENT_ID_TRAMADOL = 1)
/obj/item/reagent_containers/hypospray/autoinjector/oxy
name = "autoinjector (oxy)"
icon_state = "blue"
filled_reagents = list("dexalinp" = 5)
filled_reagents = list(REAGENT_ID_DEXALINP = 5)
/obj/item/reagent_containers/hypospray/autoinjector/rad
name = "autoinjector (rad)"
icon_state = "black"
filled_reagents = list("hyronalin" = 5)
filled_reagents = list(REAGENT_ID_HYRONALIN = 5)
/obj/item/storage/box/traumainjectors
name = "box of emergency injectors"

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

@@ -130,13 +130,13 @@
//Pills
/obj/item/reagent_containers/pill/antitox
name = "Dylovene (30u)" //VOREStation Edit
name = REAGENT_ANTITOXIN + " (30u)" //VOREStation Edit
desc = "Neutralizes many common toxins."
icon_state = "pill1"
/obj/item/reagent_containers/pill/antitox/Initialize()
. = ..()
reagents.add_reagent("anti_toxin", 30) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/tox
@@ -146,7 +146,7 @@
/obj/item/reagent_containers/pill/tox/Initialize()
. = ..()
reagents.add_reagent("toxin", 50)
reagents.add_reagent(REAGENT_ID_TOXIN, 50)
color = reagents.get_color()
/obj/item/reagent_containers/pill/cyanide
@@ -156,177 +156,177 @@
/obj/item/reagent_containers/pill/cyanide/Initialize()
. = ..()
reagents.add_reagent("cyanide", 50)
reagents.add_reagent(REAGENT_ID_CYANIDE, 50)
/obj/item/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
name = REAGENT_ADMINORDRAZINE + " pill"
desc = "It's magic. We don't have to explain it."
icon_state = "pillA"
/obj/item/reagent_containers/pill/adminordrazine/Initialize()
. = ..()
reagents.add_reagent("adminordrazine", 5)
reagents.add_reagent(REAGENT_ID_ADMINORDRAZINE, 5)
/obj/item/reagent_containers/pill/stox
name = "Soporific (15u)"
name = REAGENT_STOXIN + " (15u)"
desc = "Commonly used to treat insomnia."
icon_state = "pill2"
/obj/item/reagent_containers/pill/stox/Initialize()
. = ..()
reagents.add_reagent("stoxin", 15)
reagents.add_reagent(REAGENT_ID_STOXIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/kelotane
name = "Kelotane (20u)" //VOREStation Edit
name = REAGENT_KELOTANE + " (20u)" //VOREStation Edit
desc = "Used to treat burns."
icon_state = "pill3"
/obj/item/reagent_containers/pill/kelotane/Initialize()
. = ..()
reagents.add_reagent("kelotane", 20) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_KELOTANE, 20) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/paracetamol
name = "Paracetamol (15u)"
desc = "Paracetamol! A painkiller for the ages. Chewables!"
name = REAGENT_PARACETAMOL + " (15u)"
desc = REAGENT_PARACETAMOL + "! A painkiller for the ages. Chewables!"
icon_state = "pill3"
/obj/item/reagent_containers/pill/paracetamol/Initialize()
. = ..()
reagents.add_reagent("paracetamol", 15)
reagents.add_reagent(REAGENT_ID_PARACETAMOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/tramadol
name = "Tramadol (15u)"
name = REAGENT_TRAMADOL + " (15u)"
desc = "A simple painkiller."
icon_state = "pill3"
/obj/item/reagent_containers/pill/tramadol/Initialize()
. = ..()
reagents.add_reagent("tramadol", 15)
reagents.add_reagent(REAGENT_ID_TRAMADOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/methylphenidate
name = "Methylphenidate (15u)"
name = REAGENT_METHYLPHENIDATE + " (15u)"
desc = "Improves the ability to concentrate."
icon_state = "pill2"
/obj/item/reagent_containers/pill/methylphenidate/Initialize()
. = ..()
reagents.add_reagent("methylphenidate", 15)
reagents.add_reagent(REAGENT_ID_METHYLPHENIDATE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/citalopram
name = "Citalopram (15u)"
name = REAGENT_CITALOPRAM + " (15u)"
desc = "Mild anti-depressant."
icon_state = "pill4"
/obj/item/reagent_containers/pill/citalopram/Initialize()
. = ..()
reagents.add_reagent("citalopram", 15)
reagents.add_reagent(REAGENT_ID_CITALOPRAM, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin
name = "Dexalin (7.5u)" //VOREstation Edit
name = REAGENT_DEXALIN + " (7.5u)" //VOREstation Edit
desc = "Used to treat oxygen deprivation."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dexalin/Initialize()
. = ..()
reagents.add_reagent("dexalin", 7.5) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_DEXALIN, 7.5) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin_plus
name = "Dexalin Plus (15u)"
name = REAGENT_DEXALINP + " (15u)"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dexalin_plus/Initialize()
. = ..()
reagents.add_reagent("dexalinp", 15)
reagents.add_reagent(REAGENT_ID_DEXALINP, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dermaline
name = "Dermaline (15u)"
name = REAGENT_DERMALINE + " (15u)"
desc = "Used to treat burn wounds."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dermaline/Initialize()
. = ..()
reagents.add_reagent("dermaline", 15)
reagents.add_reagent(REAGENT_ID_DERMALINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dylovene
name = "Dylovene (15u)"
name = REAGENT_ANTITOXIN + " (15u)"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dylovene/Initialize()
. = ..()
reagents.add_reagent("anti_toxin", 15)
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/inaprovaline
name = "Inaprovaline (30u)"
name = REAGENT_INAPROVALINE + " (30u)"
desc = "Used to stabilize patients."
icon_state = "pill2"
/obj/item/reagent_containers/pill/inaprovaline/Initialize()
. = ..()
reagents.add_reagent("inaprovaline", 30)
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/bicaridine
name = "Bicaridine (20u)"
name = REAGENT_BICARIDINE + " (20u)"
desc = "Used to treat physical injuries."
icon_state = "pill2"
/obj/item/reagent_containers/pill/bicaridine/Initialize()
. = ..()
reagents.add_reagent("bicaridine", 20)
reagents.add_reagent(REAGENT_ID_BICARIDINE, 20)
color = reagents.get_color()
/obj/item/reagent_containers/pill/spaceacillin
name = "Spaceacillin (15u)" //VOREStation Edit
name = REAGENT_SPACEACILLIN + " (15u)" //VOREStation Edit
desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
icon_state = "pill3"
/obj/item/reagent_containers/pill/spaceacillin/Initialize()
. = ..()
reagents.add_reagent("spaceacillin", 15)
reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/carbon
name = "Carbon (30u)" //VOREStation Edit
name = REAGENT_CARBON + " (30u)" //VOREStation Edit
desc = "Used to neutralise chemicals in the stomach."
icon_state = "pill3"
/obj/item/reagent_containers/pill/carbon/Initialize()
. = ..()
reagents.add_reagent("carbon", 30) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_CARBON, 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/iron
name = "Iron (30u)" //VOREStation Edit
name = REAGENT_IRON + " (30u)" //VOREStation Edit
desc = "Used to aid in blood regeneration after bleeding for red-blooded crew."
icon_state = "pill1"
/obj/item/reagent_containers/pill/iron/Initialize()
. = ..()
reagents.add_reagent("iron", 30) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_IRON, 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/copper
name = "Copper (30u)"
name = REAGENT_COPPER + " (30u)"
desc = "Used to aid in blood regeneration after bleeding for blue-blooded crew."
icon_state = "pill1"
/obj/item/reagent_containers/pill/copper/Initialize()
. = ..()
reagents.add_reagent("copper", 30)
reagents.add_reagent(REAGENT_ID_COPPER, 30)
color = reagents.get_color()
//Not-quite-medicine
@@ -337,8 +337,8 @@
/obj/item/reagent_containers/pill/happy/Initialize()
. = ..()
reagents.add_reagent("bliss", 15)
reagents.add_reagent("sugar", 15)
reagents.add_reagent(REAGENT_ID_BLISS, 15)
reagents.add_reagent(REAGENT_ID_SUGAR, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/zoom
@@ -349,9 +349,9 @@
/obj/item/reagent_containers/pill/zoom/Initialize()
. = ..()
if(prob(50)) //VOREStation edit begin: Zoom pill adjustments
reagents.add_reagent("mold", 2) //Chance to be more dangerous
reagents.add_reagent("expired_medicine", 5)
reagents.add_reagent("stimm", 5) //VOREStation edit end: Zoom pill adjustments
reagents.add_reagent(REAGENT_ID_MOLD, 2) //Chance to be more dangerous
reagents.add_reagent(REAGENT_ID_EXPIREDMEDICINE, 5)
reagents.add_reagent(REAGENT_ID_STIMM, 5) //VOREStation edit end: Zoom pill adjustments
color = reagents.get_color()
/obj/item/reagent_containers/pill/diet
@@ -361,5 +361,5 @@
/obj/item/reagent_containers/pill/diet/Initialize()
. = ..()
reagents.add_reagent("lipozine", 15) //VOREStation Edit
reagents.add_reagent(REAGENT_ID_LIPOZINE, 15) //VOREStation Edit
color = reagents.get_color()

80
code/modules/reagents/reagent_containers/pill_vr.dm
View File

@@ -1,151 +1,151 @@
/obj/item/reagent_containers/pill/nutriment
name = "Nutriment (30u)"
desc = "Used to feed people on the field. Contains 30 units of Nutriment."
name = REAGENT_NUTRIMENT + " (30u)"
desc = "Used to feed people on the field. Contains 30 units of " + REAGENT_NUTRIMENT + "."
icon_state = "pill10"
/obj/item/reagent_containers/pill/nutriment/Initialize()
. = ..()
reagents.add_reagent("nutriment", 30)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
/obj/item/reagent_containers/pill/protein
name = "Protein (30u)"
desc = "Used to feed carnivores on the field. Contains 30 units of Protein."
name = REAGENT_PROTEIN + " (30u)"
desc = "Used to feed carnivores on the field. Contains 30 units of " + REAGENT_PROTEIN + "."
icon_state = "pill24"
/obj/item/reagent_containers/pill/protein/Initialize()
. = ..()
reagents.add_reagent("protein", 30)
reagents.add_reagent(REAGENT_ID_PROTEIN, 30)
/obj/item/reagent_containers/pill/rezadone
name = "Rezadone (5u)"
name = REAGENT_REZADONE + " (5u)"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
icon_state = "pill2"
/obj/item/reagent_containers/pill/rezadone/Initialize()
. = ..()
reagents.add_reagent("rezadone", 5)
reagents.add_reagent(REAGENT_ID_REZADONE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/peridaxon
name = "Peridaxon (10u)"
name = REAGENT_PERIDAXON + " (10u)"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
icon_state = "pill10"
/obj/item/reagent_containers/pill/peridaxon/Initialize()
. = ..()
reagents.add_reagent("peridaxon", 10)
reagents.add_reagent(REAGENT_ID_PERIDAXON, 10)
/obj/item/reagent_containers/pill/carthatoline
name = "Carthatoline (15u)"
desc = "Carthatoline is strong evacuant used to treat severe poisoning."
name = REAGENT_CARTHATOLINE + " (15u)"
desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
icon_state = "pill4"
/obj/item/reagent_containers/pill/carthatoline/Initialize()
. = ..()
reagents.add_reagent("carthatoline", 15)
reagents.add_reagent(REAGENT_ID_CARTHATOLINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/alkysine
name = "Alkysine (10u)"
desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
name = REAGENT_ALKYSINE + " (10u)"
desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
icon_state = "pill3"
/obj/item/reagent_containers/pill/alkysine/Initialize()
. = ..()
reagents.add_reagent("alkysine", 10)
reagents.add_reagent(REAGENT_ID_ALKYSINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/imidazoline
name = "Imidazoline (15u)"
name = REAGENT_IMIDAZOLINE + " (15u)"
desc = "Heals eye damage."
icon_state = "pill3"
/obj/item/reagent_containers/pill/imidazoline/Initialize()
. = ..()
reagents.add_reagent("imidazoline", 15)
reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/osteodaxon
name = "Osteodaxon (25u)"
name = REAGENT_OSTEODAXON + " (25u)"
desc = "An experimental drug used to heal bone fractures."
icon_state = "pill2"
/obj/item/reagent_containers/pill/osteodaxon/Initialize()
. = ..()
reagents.add_reagent("osteodaxon", 15)
reagents.add_reagent("inaprovaline", 10)
reagents.add_reagent(REAGENT_ID_OSTEODAXON, 15)
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/myelamine
name = "Myelamine (25u)"
name = REAGENT_MYELAMINE + " (25u)"
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
icon_state = "pill1"
/obj/item/reagent_containers/pill/myelamine/Initialize()
. = ..()
reagents.add_reagent("myelamine", 15)
reagents.add_reagent("inaprovaline", 10)
reagents.add_reagent(REAGENT_ID_MYELAMINE, 15)
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/hyronalin
name = "Hyronalin (15u)"
desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
name = REAGENT_HYRONALIN + " (15u)"
desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
icon_state = "pill4"
/obj/item/reagent_containers/pill/hyronalin/Initialize()
. = ..()
reagents.add_reagent("hyronalin", 15)
reagents.add_reagent(REAGENT_ID_HYRONALIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/arithrazine
name = "Arithrazine (5u)"
desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
name = REAGENT_ARITHRAZINE + " (5u)"
desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
icon_state = "pill2"
/obj/item/reagent_containers/pill/arithrazine/Initialize()
. = ..()
reagents.add_reagent("arithrazine", 5)
reagents.add_reagent(REAGENT_ID_ARITHRAZINE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/corophizine
name = "Corophizine (5u)"
name = REAGENT_COROPHIZINE + " (5u)"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon_state = "pill2"
/obj/item/reagent_containers/pill/corophizine/Initialize()
. = ..()
reagents.add_reagent("corophizine", 5)
reagents.add_reagent(REAGENT_ID_COROPHIZINE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/vermicetol
name = "Vermicetol (15u)"
name = REAGENT_VERMICETOL + " (15u)"
desc = "An extremely potent drug to treat physical injuries."
icon_state = "pill1"
/obj/item/reagent_containers/pill/vermicetol/Initialize()
. = ..()
reagents.add_reagent("vermicetol", 15)
reagents.add_reagent(REAGENT_ID_VERMICETOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/healing_nanites
name = "Healing nanites (30u)"
name = REAGENT_HEALINGNANITES + " (30u)"
desc = "Miniature medical robots that swiftly restore bodily damage."
icon_state = "pill1"
/obj/item/reagent_containers/pill/healing_nanites/Initialize()
. = ..()
reagents.add_reagent("healing_nanites", 30)
reagents.add_reagent(REAGENT_ID_HEALINGNANITES, 30)
color = reagents.get_color()
/*CHOMPStation removal begin
/obj/item/reagent_containers/pill/sleevingcure
name = "Resleeving Sickness Cure (1u)"
name = REAGENT_SLEEVINGCURE + " (1u)"
desc = "A rare cure provided by Vey-Med that helps counteract negative side effects of using imperfect resleeving machinery."
icon_state = "pill3"
/obj/item/reagent_containers/pill/sleevingcure/Initialize()
. = ..()
reagents.add_reagent("sleevingcure", 1)
reagents.add_reagent(REAGENT_ID_SLEEVINGCURE, 1)
color = reagents.get_color()
*/ //CHOMPStation removal end
@@ -156,5 +156,5 @@
/obj/item/reagent_containers/pill/airlock/New()
..()
reagents.add_reagent("anti_toxin", 15)
reagents.add_reagent("paracetamol", 5)
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)

20
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -44,13 +44,13 @@
user.setClickCooldown(4)
if(reagents.has_reagent("sacid"))
if(reagents.has_reagent(REAGENT_ID_SACID))
message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
log_game("[key_name(user)] fired sulphuric acid from \a [src].")
if(reagents.has_reagent("pacid"))
if(reagents.has_reagent(REAGENT_ID_PACID))
message_admins("[key_name_admin(user)] fired Polyacid from \a [src].")
log_game("[key_name(user)] fired Polyacid from \a [src].")
if(reagents.has_reagent("lube"))
if(reagents.has_reagent(REAGENT_ID_LUBE))
message_admins("[key_name_admin(user)] fired Space lube from \a [src].")
log_game("[key_name(user)] fired Space lube from \a [src].")
return
@@ -110,15 +110,15 @@
/obj/item/reagent_containers/spray/cleaner/Initialize()
. = ..()
reagents.add_reagent("cleaner", volume)
reagents.add_reagent(REAGENT_ID_CLEANER, volume)
/obj/item/reagent_containers/spray/sterilizine
name = "sterilizine"
name = REAGENT_ID_STERILIZINE
desc = "Great for hiding incriminating bloodstains and sterilizing scalpels."
/obj/item/reagent_containers/spray/sterilizine/Initialize()
. = ..()
reagents.add_reagent("sterilizine", volume)
reagents.add_reagent(REAGENT_ID_STERILIZINE, volume)
/obj/item/reagent_containers/spray/pepper
name = "pepperspray"
@@ -134,7 +134,7 @@
/obj/item/reagent_containers/spray/pepper/Initialize()
. = ..()
reagents.add_reagent("condensedcapsaicin", 40)
reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40)
/obj/item/reagent_containers/spray/pepper/examine(mob/user)
. = ..()
@@ -166,7 +166,7 @@
/obj/item/reagent_containers/spray/waterflower/Initialize()
. = ..()
reagents.add_reagent("water", 10)
reagents.add_reagent(REAGENT_ID_WATER, 10)
/obj/item/reagent_containers/spray/chemsprayer
name = "chem sprayer"
@@ -205,7 +205,7 @@
return
/obj/item/reagent_containers/spray/plantbgone
name = "Plant-B-Gone"
name = REAGENT_PLANTBGONE
desc = "Kills those pesky weeds!"
icon = 'icons/obj/hydroponics_machines.dmi'
icon_state = "plantbgone"
@@ -214,7 +214,7 @@
/obj/item/reagent_containers/spray/plantbgone/Initialize()
. = ..()
reagents.add_reagent("plantbgone", 100)
reagents.add_reagent(REAGENT_ID_PLANTBGONE, 100)
/obj/item/reagent_containers/spray/chemsprayer/hosed
name = "hose nozzle"

2
code/modules/reagents/reagent_containers/spray_vr.dm
View File

@@ -9,4 +9,4 @@
/obj/item/reagent_containers/spray/windowsealant/New()
..()
reagents.add_reagent("silicate", 80)
reagents.add_reagent(REAGENT_ID_SILICATE, 80)

20
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -109,7 +109,7 @@
return
if(ismob(target))//Blood!
if(reagents.has_reagent("blood"))
if(reagents.has_reagent(REAGENT_ID_BLOOD))
to_chat(user, span_notice("There is already a blood sample in this syringe."))
return
@@ -343,7 +343,7 @@
/obj/item/reagent_containers/syringe/inaprovaline/Initialize()
. = ..()
reagents.add_reagent("inaprovaline", 15)
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -353,7 +353,7 @@
/obj/item/reagent_containers/syringe/antitoxin/Initialize()
. = ..()
reagents.add_reagent("anti_toxin", 15)
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -363,7 +363,7 @@
/obj/item/reagent_containers/syringe/antiviral/Initialize()
. = ..()
reagents.add_reagent("spaceacillin", 15)
reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -373,15 +373,15 @@
/obj/item/reagent_containers/syringe/drugs/Initialize()
. = ..()
reagents.add_reagent("bliss", 5)
reagents.add_reagent("mindbreaker", 5)
reagents.add_reagent("cryptobiolin", 5)
reagents.add_reagent(REAGENT_ID_BLISS, 5)
reagents.add_reagent(REAGENT_ID_MINDBREAKER, 5)
reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 5)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
/obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize()
. = ..()
reagents.add_reagent("chloralhydrate", 50)
reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 50)
mode = SYRINGE_INJECT
update_icon()
@@ -391,8 +391,8 @@
/obj/item/reagent_containers/syringe/steroid/Initialize()
..()
//reagents.add_reagent("adrenaline",5) //VOREStation Edit - No thanks.
reagents.add_reagent("hyperzine",10)
//reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks.
reagents.add_reagent(REAGENT_ID_HYPERZINE,10)
/obj/item/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo)
if(!ishuman(loc))

4
code/modules/reagents/reagent_containers/virology.dm
View File

@@ -13,7 +13,7 @@
. = ..()
diseases += new /datum/disease/advance/cold
data["viruses"] = diseases
reagents.add_reagent("blood", 10, data)
reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
/obj/item/reagent_containers/glass/bottle/culture/flu
name = "flu virus culture"
@@ -23,4 +23,4 @@
. = ..()
diseases += new /datum/disease/advance/flu
data["viruses"] = diseases
reagents.add_reagent("blood", 10, data)
reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)