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

[MIRROR] Initialize fixing (#10335)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-08 14:22:04 -07:00
committed by GitHub
parent 2e725a0727
commit ce2446922e
888 changed files with 2876 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/reagents/hoses/connector.dm
View File

@@ -52,7 +52,7 @@
carrier = null
..()
/obj/item/hose_connector/Initialize()
/obj/item/hose_connector/Initialize(mapload)
. = ..()
create_reagents(100)
@@ -104,7 +104,7 @@
STOP_PROCESSING(SSobj, src)
..()
/obj/item/hose_connector/input/active/Initialize()
/obj/item/hose_connector/input/active/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
@@ -126,7 +126,7 @@
STOP_PROCESSING(SSobj, src)
..()
/obj/item/hose_connector/output/active/Initialize()
/obj/item/hose_connector/output/active/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)

2
code/modules/reagents/machinery/dispenser/cartridge.dm
View File

@@ -14,7 +14,7 @@
var/spawn_reagent = null
var/label = ""
/obj/item/reagent_containers/chem_disp_cartridge/Initialize()
/obj/item/reagent_containers/chem_disp_cartridge/Initialize(mapload)
. = ..()
if(spawn_reagent)
reagents.add_reagent(spawn_reagent, volume)

2
code/modules/reagents/machinery/dispenser/dispenser2.dm
View File

@@ -26,7 +26,7 @@
/// Saves all the recipes recorded by the machine
var/list/saved_recipes = list()
/obj/machinery/chemical_dispenser/Initialize()
/obj/machinery/chemical_dispenser/Initialize(mapload)
. = ..()
if(spawn_cartridges)
for(var/type in spawn_cartridges)

30
code/modules/reagents/machinery/dispenser/reagent_tank.dm
View File

@@ -28,7 +28,7 @@
..()
/obj/structure/reagent_dispensers/Initialize()
/obj/structure/reagent_dispensers/Initialize(mapload)
var/datum/reagents/R = new/datum/reagents(5000)
reagents = R
R.my_atom = src
@@ -105,7 +105,7 @@
icon_state = "water"
amount_per_transfer_from_this = 10
/obj/structure/reagent_dispensers/watertank/Initialize()
/obj/structure/reagent_dispensers/watertank/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_WATER, 1000)
@@ -114,7 +114,7 @@
desc = "A highly-pressurized water tank made to hold vast amounts of water.."
icon_state = "water_high"
/obj/structure/reagent_dispensers/watertank/high/Initialize()
/obj/structure/reagent_dispensers/watertank/high/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_WATER, 4000)
@@ -132,7 +132,7 @@
var/modded = 0
var/obj/item/assembly_holder/rig = null
/obj/structure/reagent_dispensers/fueltank/Initialize()
/obj/structure/reagent_dispensers/fueltank/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_FUEL,1000)
@@ -141,7 +141,7 @@
desc = "A highly-pressurized fuel tank made to hold vast amounts of fuel."
icon_state = "fuel_high"
/obj/structure/reagent_dispensers/fueltank/high/Initialize()
/obj/structure/reagent_dispensers/fueltank/high/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_FUEL,4000)
@@ -152,7 +152,7 @@
icon_state = "foam"
amount_per_transfer_from_this = 10
/obj/structure/reagent_dispensers/foam/Initialize()
/obj/structure/reagent_dispensers/foam/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_FIREFOAM,1000)
@@ -163,7 +163,7 @@
icon_state = "he3"
amount_per_transfer_from_this = 10
/obj/structure/reagent_dispenser/he3/Initialize()
/obj/structure/reagent_dispenser/he3/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_HELIUM3,1000)
@@ -304,7 +304,7 @@
density = FALSE
amount_per_transfer_from_this = 45
/obj/structure/reagent_dispensers/peppertank/Initialize()
/obj/structure/reagent_dispensers/peppertank/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN,1000)
@@ -317,7 +317,7 @@
density = FALSE
amount_per_transfer_from_this = 10
/obj/structure/reagent_dispensers/virusfood/Initialize()
/obj/structure/reagent_dispensers/virusfood/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_VIRUSFOOD, 1000)
@@ -330,7 +330,7 @@
density = FALSE
amount_per_transfer_from_this = 10
/obj/structure/reagent_dispensers/acid/Initialize()
/obj/structure/reagent_dispensers/acid/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_SACID, 1000)
@@ -352,7 +352,7 @@
cupholder = 1
cups = 10
/obj/structure/reagent_dispensers/water_cooler/Initialize()
/obj/structure/reagent_dispensers/water_cooler/Initialize(mapload)
. = ..()
if(bottle)
reagents.add_reagent(REAGENT_ID_WATER,2000)
@@ -492,7 +492,7 @@
icon_state = "beertankTEMP"
amount_per_transfer_from_this = 10
/obj/structure/reagent_dispensers/beerkeg/Initialize()
/obj/structure/reagent_dispensers/beerkeg/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_BEER,1000)
@@ -506,7 +506,7 @@
desc = "A wine casket with a tap on it."
icon_state = "beertankfantasy"
/obj/structure/reagent_dispensers/beerkeg/wine/Initialize()
/obj/structure/reagent_dispensers/beerkeg/wine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_REDWINE,1000)
@@ -524,7 +524,7 @@
icon_state = "oiltank"
amount_per_transfer_from_this = 120
/obj/structure/reagent_dispensers/cookingoil/Initialize()
/obj/structure/reagent_dispensers/cookingoil/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_COOKINGOIL,5000)
@@ -547,6 +547,6 @@
icon_state = "bloodbarrel"
amount_per_transfer_from_this = 10
/obj/structure/reagent_dispensers/bloodbarrel/Initialize()
/obj/structure/reagent_dispensers/bloodbarrel/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_BLOOD, 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null))

2
code/modules/reagents/machinery/dispenser/reagent_tank_ch.dm
View File

@@ -6,6 +6,6 @@
amount_per_transfer_from_this = 60
anchored = 1
/obj/structure/reagent_dispensers/space_cleaner/Initialize()
/obj/structure/reagent_dispensers/space_cleaner/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CLEANER, 1000)

2
code/modules/reagents/machinery/distillery.dm
View File

@@ -59,7 +59,7 @@
// A multiplier for the production amount. This should really only ever be lower than one, otherwise you end up with duping.
var/efficiency = 1
/obj/machinery/portable_atmospherics/powered/reagent_distillery/Initialize()
/obj/machinery/portable_atmospherics/powered/reagent_distillery/Initialize(mapload)
. = ..()
create_reagents(600, /datum/reagents/distilling)

2
code/modules/reagents/machinery/grinder.dm
View File

@@ -73,7 +73,7 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
// var/static/radial_juice = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_juice")
// var/static/radial_mix = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_mix")
/obj/machinery/reagentgrinder/Initialize()
/obj/machinery/reagentgrinder/Initialize(mapload)
. = ..()
beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
default_apply_parts()

2
code/modules/reagents/machinery/injector_maker.dm
View File

@@ -30,7 +30,7 @@
var/capacity_plastic = 60000 // cost_plastic_large * 40
/obj/machinery/injector_maker/Initialize()
/obj/machinery/injector_maker/Initialize(mapload)
. = ..()
default_apply_parts()

2
code/modules/reagents/machinery/pump.dm
View File

@@ -23,7 +23,7 @@
var/unlocked = 0
var/open = 0
/obj/machinery/pump/Initialize()
/obj/machinery/pump/Initialize(mapload)
create_reagents(200)
. = ..()
default_apply_parts()

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

@@ -3,7 +3,7 @@
desc = "This box contains blood packs."
icon_state = "sterile"
/obj/item/storage/box/bloodpacks/Initialize()
/obj/item/storage/box/bloodpacks/Initialize(mapload)
. = ..()
new /obj/item/reagent_containers/blood/empty(src)
new /obj/item/reagent_containers/blood/empty(src)
@@ -29,7 +29,7 @@
var/blood_type = null
var/reag_id = REAGENT_ID_BLOOD
/obj/item/reagent_containers/blood/Initialize()
/obj/item/reagent_containers/blood/Initialize(mapload)
. = ..()
base_name = name
base_desc = desc
@@ -114,6 +114,6 @@
name = "Ration BloodPack"
desc = "A standard issue BloodPack Ration given to crew that require blood to be sustained!"
/obj/item/reagent_containers/blood/random_bloodsucker/Initialize()
/obj/item/reagent_containers/blood/random_bloodsucker/Initialize(mapload)
blood_type = pick("A+", "A-", "B+", "B-", "O-", "O+", "AB+", "AB-")
. = ..()

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

@@ -34,7 +34,7 @@
bypass_protection = TRUE // Because mercs tend to be in spacesuits.
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()
/obj/item/reagent_containers/borghypo/Initialize(mapload)
. = ..()
for(var/T in reagent_ids)

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

@@ -55,7 +55,7 @@
)
//CHOMP Addition for feeder in the above list. I am paranoid about comments within lists so this is outside.
/obj/item/reagent_containers/glass/Initialize()
/obj/item/reagent_containers/glass/Initialize(mapload)
. = ..()
if(LAZYLEN(prefill))
for(var/R in prefill)
@@ -203,7 +203,7 @@
/obj/item/reagent_containers/glass/beaker/get_rating()
return rating
/obj/item/reagent_containers/glass/beaker/Initialize()
/obj/item/reagent_containers/glass/beaker/Initialize(mapload)
. = ..()
desc += " Can hold up to [volume] units."

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

@@ -21,7 +21,7 @@
var/list/filled_reagents = list()
var/hyposound // What sound do we play on use?
/obj/item/reagent_containers/hypospray/Initialize()
/obj/item/reagent_containers/hypospray/Initialize(mapload)
. = ..()
if(filled)
if(filled_reagents)
@@ -102,7 +102,7 @@
var/obj/item/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name.
volume = 0
/obj/item/reagent_containers/hypospray/vial/Initialize()
/obj/item/reagent_containers/hypospray/vial/Initialize(mapload)
. = ..()
icon_state = "[initial(icon_state)]"
loaded_vial = new /obj/item/reagent_containers/glass/beaker/vial(src) //Comes with an empty vial
@@ -180,7 +180,7 @@
filled = 0
filled_reagents = list()
/obj/item/reagent_containers/hypospray/autoinjector/used/Initialize()
/obj/item/reagent_containers/hypospray/autoinjector/used/Initialize(mapload)
. = ..()
flags &= ~OPENCONTAINER
icon_state = "[initial(icon_state)]0"

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

@@ -17,7 +17,7 @@
slot_flags = SLOT_EARS
volume = 60
/obj/item/reagent_containers/pill/Initialize()
/obj/item/reagent_containers/pill/Initialize(mapload)
. = ..()
if(!icon_state)
icon_state = "[base_state][rand(1, 4)]" //preset pills only use colour changing or unique icons
@@ -134,7 +134,7 @@
desc = "Neutralizes many common toxins."
icon_state = "pill1"
/obj/item/reagent_containers/pill/antitox/Initialize()
/obj/item/reagent_containers/pill/antitox/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 30)
color = reagents.get_color()
@@ -144,7 +144,7 @@
desc = "Highly toxic."
icon_state = "pill4"
/obj/item/reagent_containers/pill/tox/Initialize()
/obj/item/reagent_containers/pill/tox/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_TOXIN, 50)
color = reagents.get_color()
@@ -154,7 +154,7 @@
desc = "It's marked 'KCN'. Smells vaguely of almonds."
icon_state = "pill9"
/obj/item/reagent_containers/pill/cyanide/Initialize()
/obj/item/reagent_containers/pill/cyanide/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CYANIDE, 50)
@@ -164,7 +164,7 @@
desc = "It's magic. We don't have to explain it."
icon_state = "pillA"
/obj/item/reagent_containers/pill/adminordrazine/Initialize()
/obj/item/reagent_containers/pill/adminordrazine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_ADMINORDRAZINE, 5)
@@ -174,7 +174,7 @@
desc = "Commonly used to treat insomnia."
icon_state = "pill2"
/obj/item/reagent_containers/pill/stox/Initialize()
/obj/item/reagent_containers/pill/stox/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_STOXIN, 15)
color = reagents.get_color()
@@ -184,7 +184,7 @@
desc = "Used to treat burns."
icon_state = "pill3"
/obj/item/reagent_containers/pill/kelotane/Initialize()
/obj/item/reagent_containers/pill/kelotane/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_KELOTANE, 20)
color = reagents.get_color()
@@ -194,7 +194,7 @@
desc = REAGENT_PARACETAMOL + "! A painkiller for the ages. Chewables!"
icon_state = "pill3"
/obj/item/reagent_containers/pill/paracetamol/Initialize()
/obj/item/reagent_containers/pill/paracetamol/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_PARACETAMOL, 15)
color = reagents.get_color()
@@ -204,7 +204,7 @@
desc = "A simple painkiller."
icon_state = "pill3"
/obj/item/reagent_containers/pill/tramadol/Initialize()
/obj/item/reagent_containers/pill/tramadol/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_TRAMADOL, 15)
color = reagents.get_color()
@@ -214,7 +214,7 @@
desc = "Improves the ability to concentrate."
icon_state = "pill2"
/obj/item/reagent_containers/pill/methylphenidate/Initialize()
/obj/item/reagent_containers/pill/methylphenidate/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_METHYLPHENIDATE, 15)
color = reagents.get_color()
@@ -224,7 +224,7 @@
desc = "Mild anti-depressant."
icon_state = "pill4"
/obj/item/reagent_containers/pill/citalopram/Initialize()
/obj/item/reagent_containers/pill/citalopram/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CITALOPRAM, 15)
color = reagents.get_color()
@@ -234,7 +234,7 @@
desc = "Used to treat oxygen deprivation."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dexalin/Initialize()
/obj/item/reagent_containers/pill/dexalin/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_DEXALIN, 7.5)
color = reagents.get_color()
@@ -244,7 +244,7 @@
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dexalin_plus/Initialize()
/obj/item/reagent_containers/pill/dexalin_plus/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_DEXALINP, 15)
color = reagents.get_color()
@@ -254,7 +254,7 @@
desc = "Used to treat burn wounds."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dermaline/Initialize()
/obj/item/reagent_containers/pill/dermaline/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_DERMALINE, 15)
color = reagents.get_color()
@@ -264,7 +264,7 @@
desc = "A broad-spectrum anti-toxin."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dylovene/Initialize()
/obj/item/reagent_containers/pill/dylovene/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
color = reagents.get_color()
@@ -274,7 +274,7 @@
desc = "Used to stabilize patients."
icon_state = "pill2"
/obj/item/reagent_containers/pill/inaprovaline/Initialize()
/obj/item/reagent_containers/pill/inaprovaline/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 30)
color = reagents.get_color()
@@ -284,7 +284,7 @@
desc = "Used to treat physical injuries."
icon_state = "pill2"
/obj/item/reagent_containers/pill/bicaridine/Initialize()
/obj/item/reagent_containers/pill/bicaridine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_BICARIDINE, 20)
color = reagents.get_color()
@@ -294,7 +294,7 @@
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()
/obj/item/reagent_containers/pill/spaceacillin/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
color = reagents.get_color()
@@ -304,7 +304,7 @@
desc = "Used to neutralise chemicals in the stomach."
icon_state = "pill3"
/obj/item/reagent_containers/pill/carbon/Initialize()
/obj/item/reagent_containers/pill/carbon/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CARBON, 30)
color = reagents.get_color()
@@ -314,7 +314,7 @@
desc = "Used to aid in blood regeneration after bleeding for red-blooded crew."
icon_state = "pill1"
/obj/item/reagent_containers/pill/iron/Initialize()
/obj/item/reagent_containers/pill/iron/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_IRON, 30)
color = reagents.get_color()
@@ -324,7 +324,7 @@
desc = "Used to aid in blood regeneration after bleeding for blue-blooded crew."
icon_state = "pill1"
/obj/item/reagent_containers/pill/copper/Initialize()
/obj/item/reagent_containers/pill/copper/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_COPPER, 30)
color = reagents.get_color()
@@ -335,7 +335,7 @@
desc = "Happy happy joy joy!"
icon_state = "pill4"
/obj/item/reagent_containers/pill/happy/Initialize()
/obj/item/reagent_containers/pill/happy/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_BLISS, 15)
reagents.add_reagent(REAGENT_ID_SUGAR, 15)
@@ -346,7 +346,7 @@
desc = "Zoooom!"
icon_state = "pill4"
/obj/item/reagent_containers/pill/zoom/Initialize()
/obj/item/reagent_containers/pill/zoom/Initialize(mapload)
. = ..()
if(prob(50)) //VOREStation edit begin: Zoom pill adjustments
reagents.add_reagent(REAGENT_ID_MOLD, 2) //Chance to be more dangerous
@@ -359,7 +359,7 @@
desc = "Guaranteed to get you slim!"
icon_state = "pill4"
/obj/item/reagent_containers/pill/diet/Initialize()
/obj/item/reagent_containers/pill/diet/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_LIPOZINE, 15)
color = reagents.get_color()
@@ -371,7 +371,7 @@
desc = "Used to aid in blood regeneration after or during bleeding for crew with commonly found blood types."
icon_state = "pill1"
/obj/item/reagent_containers/pill/small_blood_restoration/Initialize()
/obj/item/reagent_containers/pill/small_blood_restoration/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_IRON, 5)
reagents.add_reagent(REAGENT_ID_COPPER, 5)
@@ -384,7 +384,7 @@
desc = "Used to stabilize patients."
icon_state = "pill2"
/obj/item/reagent_containers/pill/small_inaprovaline/Initialize()
/obj/item/reagent_containers/pill/small_inaprovaline/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 5)
color = reagents.get_color()
@@ -394,7 +394,7 @@
desc = "Used for the temporary cessation of radiation effects."
icon_state = "pill2"
/obj/item/reagent_containers/pill/small_prussian_blue/Initialize()
/obj/item/reagent_containers/pill/small_prussian_blue/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_PRUSSIANBLUE, 5)
color = reagents.get_color()
@@ -404,7 +404,7 @@
desc = "A reelatively moderate painkiller typically given for more severe injuries."
icon_state = "pill2"
/obj/item/reagent_containers/pill/small_tramadol/Initialize()
/obj/item/reagent_containers/pill/small_tramadol/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_TRAMADOL, 5)
color = reagents.get_color()
@@ -414,7 +414,7 @@
desc = "A rather weak painkiller typically given for minor injuries."
icon_state = "pill3"
/obj/item/reagent_containers/pill/small_paracetamol/Initialize()
/obj/item/reagent_containers/pill/small_paracetamol/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
color = reagents.get_color()
@@ -424,7 +424,7 @@
desc = "A broad-spectrum anti-toxin."
icon_state = "pill1"
/obj/item/reagent_containers/pill/small_dylovene/Initialize()
/obj/item/reagent_containers/pill/small_dylovene/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 5)
color = reagents.get_color()

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

@@ -3,7 +3,7 @@
desc = "Used to feed people on the field. Contains 30 units of " + REAGENT_NUTRIMENT + "."
icon_state = "pill10"
/obj/item/reagent_containers/pill/nutriment/Initialize()
/obj/item/reagent_containers/pill/nutriment/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
@@ -12,7 +12,7 @@
desc = "Used to feed carnivores on the field. Contains 30 units of " + REAGENT_PROTEIN + "."
icon_state = "pill24"
/obj/item/reagent_containers/pill/protein/Initialize()
/obj/item/reagent_containers/pill/protein/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_PROTEIN, 30)
@@ -21,7 +21,7 @@
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()
/obj/item/reagent_containers/pill/rezadone/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_REZADONE, 5)
color = reagents.get_color()
@@ -31,7 +31,7 @@
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
icon_state = "pill10"
/obj/item/reagent_containers/pill/peridaxon/Initialize()
/obj/item/reagent_containers/pill/peridaxon/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_PERIDAXON, 10)
@@ -40,7 +40,7 @@
desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
icon_state = "pill4"
/obj/item/reagent_containers/pill/carthatoline/Initialize()
/obj/item/reagent_containers/pill/carthatoline/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CARTHATOLINE, 15)
color = reagents.get_color()
@@ -50,7 +50,7 @@
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()
/obj/item/reagent_containers/pill/alkysine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_ALKYSINE, 10)
color = reagents.get_color()
@@ -60,7 +60,7 @@
desc = "Heals eye damage."
icon_state = "pill3"
/obj/item/reagent_containers/pill/imidazoline/Initialize()
/obj/item/reagent_containers/pill/imidazoline/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 15)
color = reagents.get_color()
@@ -70,7 +70,7 @@
desc = "An experimental drug used to heal bone fractures."
icon_state = "pill2"
/obj/item/reagent_containers/pill/osteodaxon/Initialize()
/obj/item/reagent_containers/pill/osteodaxon/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_OSTEODAXON, 15)
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
@@ -81,7 +81,7 @@
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
icon_state = "pill1"
/obj/item/reagent_containers/pill/myelamine/Initialize()
/obj/item/reagent_containers/pill/myelamine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_MYELAMINE, 15)
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
@@ -92,7 +92,7 @@
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()
/obj/item/reagent_containers/pill/hyronalin/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_HYRONALIN, 15)
color = reagents.get_color()
@@ -102,7 +102,7 @@
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()
/obj/item/reagent_containers/pill/arithrazine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_ARITHRAZINE, 5)
color = reagents.get_color()
@@ -112,7 +112,7 @@
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon_state = "pill2"
/obj/item/reagent_containers/pill/corophizine/Initialize()
/obj/item/reagent_containers/pill/corophizine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_COROPHIZINE, 5)
color = reagents.get_color()
@@ -122,7 +122,7 @@
desc = "An extremely potent drug to treat physical injuries."
icon_state = "pill1"
/obj/item/reagent_containers/pill/vermicetol/Initialize()
/obj/item/reagent_containers/pill/vermicetol/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_VERMICETOL, 15)
color = reagents.get_color()
@@ -132,7 +132,7 @@
desc = "Miniature medical robots that swiftly restore bodily damage."
icon_state = "pill1"
/obj/item/reagent_containers/pill/healing_nanites/Initialize()
/obj/item/reagent_containers/pill/healing_nanites/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_HEALINGNANITES, 30)
color = reagents.get_color()
@@ -143,7 +143,7 @@
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()
/obj/item/reagent_containers/pill/sleevingcure/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_SLEEVINGCURE, 1)
color = reagents.get_color()

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

@@ -20,7 +20,7 @@
var/list/spray_sizes = list(1,3)
volume = 250
/obj/item/reagent_containers/spray/Initialize()
/obj/item/reagent_containers/spray/Initialize(mapload)
. = ..()
src.verbs -= /obj/item/reagent_containers/verb/set_APTFT
@@ -108,7 +108,7 @@
desc = "BLAM!-brand non-foaming space cleaner!"
volume = 50
/obj/item/reagent_containers/spray/cleaner/Initialize()
/obj/item/reagent_containers/spray/cleaner/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CLEANER, volume)
@@ -116,7 +116,7 @@
name = REAGENT_ID_STERILIZINE
desc = "Great for hiding incriminating bloodstains and sterilizing scalpels."
/obj/item/reagent_containers/spray/sterilizine/Initialize()
/obj/item/reagent_containers/spray/sterilizine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_STERILIZINE, volume)
@@ -132,7 +132,7 @@
volume = 40
var/safety = TRUE
/obj/item/reagent_containers/spray/pepper/Initialize()
/obj/item/reagent_containers/spray/pepper/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40)
@@ -164,7 +164,7 @@
drop_sound = 'sound/items/drop/herb.ogg'
pickup_sound = 'sound/items/pickup/herb.ogg'
/obj/item/reagent_containers/spray/waterflower/Initialize()
/obj/item/reagent_containers/spray/waterflower/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_WATER, 10)
@@ -212,7 +212,7 @@
item_state = "plantbgone"
volume = 100
/obj/item/reagent_containers/spray/plantbgone/Initialize()
/obj/item/reagent_containers/spray/plantbgone/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_PLANTBGONE, 100)
@@ -234,7 +234,7 @@
var/obj/item/hose_connector/input/active/InputSocket
/obj/item/reagent_containers/spray/chemsprayer/hosed/Initialize()
/obj/item/reagent_containers/spray/chemsprayer/hosed/Initialize(mapload)
. = ..()
InputSocket = new(src)

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

@@ -39,7 +39,7 @@
pickup_sound = 'sound/items/pickup/glass.ogg'
/obj/item/reagent_containers/syringe/Initialize()
/obj/item/reagent_containers/syringe/Initialize(mapload)
. = ..()
update_icon()
@@ -354,7 +354,7 @@
name = "Syringe (inaprovaline)"
desc = "Contains inaprovaline - used to stabilize patients."
/obj/item/reagent_containers/syringe/inaprovaline/Initialize()
/obj/item/reagent_containers/syringe/inaprovaline/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_INAPROVALINE, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
@@ -364,7 +364,7 @@
name = "Syringe (anti-toxin)"
desc = "Contains anti-toxins."
/obj/item/reagent_containers/syringe/antitoxin/Initialize()
/obj/item/reagent_containers/syringe/antitoxin/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
@@ -374,7 +374,7 @@
name = "Syringe (spaceacillin)"
desc = "Contains antiviral agents."
/obj/item/reagent_containers/syringe/antiviral/Initialize()
/obj/item/reagent_containers/syringe/antiviral/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
@@ -384,7 +384,7 @@
name = "Syringe (drugs)"
desc = "Contains aggressive drugs meant for torture."
/obj/item/reagent_containers/syringe/drugs/Initialize()
/obj/item/reagent_containers/syringe/drugs/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_BLISS, 5)
reagents.add_reagent(REAGENT_ID_MINDBREAKER, 5)
@@ -392,7 +392,7 @@
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
/obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize()
/obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 50)
mode = SYRINGE_INJECT
@@ -402,7 +402,7 @@
name = "Syringe (anabolic steroids)"
desc = "Contains drugs for muscle growth."
/obj/item/reagent_containers/syringe/steroid/Initialize()
/obj/item/reagent_containers/syringe/steroid/Initialize(mapload)
. = ..()
//reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks.
reagents.add_reagent(REAGENT_ID_HYPERZINE,10)

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

@@ -9,7 +9,7 @@
name = "cold virus culture"
desc = "A bottle with the common cold culture"
/obj/item/reagent_containers/glass/bottle/culture/cold/Initialize()
/obj/item/reagent_containers/glass/bottle/culture/cold/Initialize(mapload)
. = ..()
diseases += new /datum/disease/advance/cold
data["viruses"] = diseases
@@ -19,7 +19,7 @@
name = "flu virus culture"
desc = "A bottle with the flu culture"
/obj/item/reagent_containers/glass/bottle/culture/flu/Initialize()
/obj/item/reagent_containers/glass/bottle/culture/flu/Initialize(mapload)
. = ..()
diseases += new /datum/disease/advance/flu
data["viruses"] = diseases
@@ -29,7 +29,7 @@
name = "blob spores culture"
desc = "A bottle with blob spores"
/obj/item/reagent_containers/glass/bottle/culture/blobspores/Initialize()
/obj/item/reagent_containers/glass/bottle/culture/blobspores/Initialize(mapload)
. = ..()
diseases += new /datum/disease/advance/blobspores
data["viruses"] = diseases
@@ -39,7 +39,7 @@
name = "macrophages culture"
desc = "A bottle with giant viruses"
/obj/item/reagent_containers/glass/bottle/culture/macrophages/Initialize()
/obj/item/reagent_containers/glass/bottle/culture/macrophages/Initialize(mapload)
. = ..()
diseases += new /datum/disease/advance/macrophage
data["viruses"] = diseases
@@ -49,7 +49,7 @@
name = "experimental disease culture bottle"
desc = "A small bottle. Contains an untested viral culture."
/obj/item/reagent_containers/glass/bottle/culture/random_virus/Initialize()
/obj/item/reagent_containers/glass/bottle/culture/random_virus/Initialize(mapload)
. = ..()
diseases += new /datum/disease/advance/random
data["viruses"] = diseases
@@ -59,7 +59,7 @@
name = "minor experimental disease culture bottle"
desc = "A small bottle. Contains a weak version of an untested viral culture."
/obj/item/reagent_containers/glass/bottle/culture/random_virus/minor/Initialize()
/obj/item/reagent_containers/glass/bottle/culture/random_virus/minor/Initialize(mapload)
. = ..()
diseases += new /datum/disease/advance/random/minor
data["viruses"] = diseases

4
code/modules/reagents/reagents/other_ch.dm
View File

@@ -125,7 +125,7 @@
desc = "You probably shouldn't swallow this."
icon_state = "pill2"
/obj/item/reagent_containers/pill/benzilate/Initialize()
/obj/item/reagent_containers/pill/benzilate/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_BENZILATE, 50)
color = reagents.get_color()
@@ -136,7 +136,7 @@
desc = "Smells like... lilacs?"
icon_state = "pill5"
/obj/item/reagent_containers/pill/phenethylamine/Initialize()
/obj/item/reagent_containers/pill/phenethylamine/Initialize(mapload)
. = ..()
reagents.add_reagent(REAGENT_ID_PHENETHYLAMINE, 50)
color = reagents.get_color()