Merge pull request #15585 from SandPoot/Initialize(mapload)

Every case of initialize that should have mapload, does
This commit is contained in:
silicons
2022-04-15 17:41:57 -07:00
committed by GitHub
881 changed files with 1588 additions and 1588 deletions
@@ -92,7 +92,7 @@
var/list/saved_recipes = list()
/obj/machinery/chem_dispenser/Initialize()
/obj/machinery/chem_dispenser/Initialize(mapload)
. = ..()
dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc)
if(emagged_reagents)
@@ -534,7 +534,7 @@
return "purple"
/obj/machinery/chem_dispenser/drinks/Initialize()
/obj/machinery/chem_dispenser/drinks/Initialize(mapload)
. = ..()
AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE)
@@ -629,7 +629,7 @@
obj_flags = CAN_BE_HIT | EMAGGED
flags_1 = NODECONSTRUCT_1
/obj/machinery/chem_dispenser/drinks/fullupgrade/Initialize()
/obj/machinery/chem_dispenser/drinks/fullupgrade/Initialize(mapload)
. = ..()
dispensable_reagents |= emagged_reagents //adds emagged reagents
component_parts = list()
@@ -689,7 +689,7 @@
obj_flags = CAN_BE_HIT | EMAGGED
flags_1 = NODECONSTRUCT_1
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade/Initialize()
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade/Initialize(mapload)
. = ..()
dispensable_reagents |= emagged_reagents //adds emagged reagents
component_parts = list()
@@ -736,7 +736,7 @@
upgrade_reagents2 = null
upgrade_reagents3 = null
/obj/machinery/chem_dispenser/mutagensaltpeter/Initialize()
/obj/machinery/chem_dispenser/mutagensaltpeter/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/machine/chem_dispenser(null)
@@ -753,7 +753,7 @@
obj_flags = CAN_BE_HIT | EMAGGED
flags_1 = NODECONSTRUCT_1
/obj/machinery/chem_dispenser/fullupgrade/Initialize()
/obj/machinery/chem_dispenser/fullupgrade/Initialize(mapload)
. = ..()
dispensable_reagents |= emagged_reagents //adds emagged reagents
component_parts = list()
@@ -818,7 +818,7 @@
/datum/reagent/medicine/morphine
)
/obj/machinery/chem_dispenser/abductor/Initialize()
/obj/machinery/chem_dispenser/abductor/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/circuitboard/machine/chem_dispenser(null)
@@ -22,7 +22,7 @@
var/list/pillStyles
var/fermianalyze //Give more detail on fermireactions on analysis
/obj/machinery/chem_master/Initialize()
/obj/machinery/chem_master/Initialize(mapload)
create_reagents(100)
//Calculate the span tags and ids fo all the available pill icons
@@ -16,7 +16,7 @@
var/datum/symptom/selected_symptom
var/obj/item/reagent_containers/beaker
/obj/machinery/computer/pandemic/Initialize()
/obj/machinery/computer/pandemic/Initialize(mapload)
. = ..()
update_icon()
@@ -25,13 +25,13 @@
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)
. = ..()
holdingitems = list()
beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
beaker.desc += " May contain blended dust. Don't breathe this in!"
/obj/machinery/reagentgrinder/constructed/Initialize()
/obj/machinery/reagentgrinder/constructed/Initialize(mapload)
. = ..()
holdingitems = list()
QDEL_NULL(beaker)
@@ -29,7 +29,7 @@
opaque = FALSE
alpha = 100
/obj/machinery/smoke_machine/Initialize()
/obj/machinery/smoke_machine/Initialize(mapload)
. = ..()
create_reagents(REAGENTS_BASE_VOLUME)
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
@@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
return list()
. = ..()
/obj/item/paper/secretrecipe/Initialize()
/obj/item/paper/secretrecipe/Initialize(mapload)
. = ..()
if(SSpersistence.initialized)
UpdateInfo()
@@ -10,7 +10,7 @@
var/color_to_apply = "#FFFFFF"
var/mutable_appearance/fill_overlay
/obj/item/reagent_containers/blood/Initialize()
/obj/item/reagent_containers/blood/Initialize(mapload)
. = ..()
if(blood_type != null)
reagents.add_reagent(/datum/reagent/blood, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"bloodcolor"=bloodtype_to_color(blood_type), "blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
@@ -43,7 +43,7 @@
/obj/item/reagent_containers/blood/random
icon_state = "random_bloodpack"
/obj/item/reagent_containers/blood/random/Initialize()
/obj/item/reagent_containers/blood/random/Initialize(mapload)
icon_state = "bloodpack"
blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L", "SY", "HF", "GEL", "BUG")
return ..()
@@ -34,7 +34,7 @@ Borg Hypospray
//Used as list for input() in shakers.
var/list/reagent_names = list()
/obj/item/reagent_containers/borghypo/Initialize()
/obj/item/reagent_containers/borghypo/Initialize(mapload)
. = ..()
for(var/R in reagent_ids)
@@ -8,7 +8,7 @@
possible_transfer_amounts = list(5,10,15,25,30)
volume = 30
/obj/item/reagent_containers/glass/bottle/Initialize()
/obj/item/reagent_containers/glass/bottle/Initialize(mapload)
. = ..()
if(!icon_state)
icon_state = "bottle"
@@ -159,7 +159,7 @@
icon = 'icons/obj/chemical.dmi'
var/extra_reagent = null
/obj/item/reagent_containers/glass/bottle/traitor/Initialize()
/obj/item/reagent_containers/glass/bottle/traitor/Initialize(mapload)
. = ..()
extra_reagent = pick(/datum/reagent/toxin/polonium, /datum/reagent/toxin/histamine, /datum/reagent/toxin/formaldehyde,
/datum/reagent/toxin/venom, /datum/reagent/toxin/fentanyl, /datum/reagent/toxin/cyanide)
@@ -128,7 +128,7 @@
possible_transfer_amounts = list(5,10,15,20,25,30,50,60)
container_flags = PH_WEAK|APTFT_ALTCLICK|APTFT_VERB
/obj/item/reagent_containers/glass/beaker/Initialize()
/obj/item/reagent_containers/glass/beaker/Initialize(mapload)
. = ..()
update_icon()
@@ -370,7 +370,7 @@
quickload = TRUE
penetrates = TRUE
/obj/item/hypospray/mkii/Initialize()
/obj/item/hypospray/mkii/Initialize(mapload)
. = ..()
if(!spawnwithvial)
update_icon()
@@ -21,7 +21,7 @@
always_reskinnable = TRUE
cached_icon = "hypovial"
/obj/item/reagent_containers/glass/bottle/vial/Initialize()
/obj/item/reagent_containers/glass/bottle/vial/Initialize(mapload)
. = ..()
update_icon()
@@ -15,7 +15,7 @@
var/self_delay = FALSE //pills are instant, this is because patches inheret their aplication from pills
var/dissolvable = TRUE
/obj/item/reagent_containers/pill/Initialize()
/obj/item/reagent_containers/pill/Initialize(mapload)
. = ..()
if(!icon_state)
icon_state = "pill[rand(1,20)]"
@@ -248,7 +248,7 @@
var/static/list/descs = list("Your feeling is telling you no, but...","Drugs are expensive, you can't afford not to eat any pills that you find."\
, "Surely, there's no way this could go bad.")
/obj/item/reagent_containers/pill/floorpill/Initialize()
/obj/item/reagent_containers/pill/floorpill/Initialize(mapload)
list_reagents = list(get_random_reagent_id() = rand(10,50))
. = ..()
name = pick(names)
@@ -134,7 +134,7 @@
var/folded_icon = "towel"
var/list/possible_colors
/obj/item/reagent_containers/rag/towel/Initialize()
/obj/item/reagent_containers/rag/towel/Initialize(mapload)
. = ..()
if(possible_colors)
add_atom_colour(pick(possible_colors), FIXED_COLOUR_PRIORITY)
@@ -229,7 +229,7 @@
generate_amount = 1
generate_delay = 40 //deciseconds
/obj/item/reagent_containers/spray/waterflower/cyborg/Initialize()
/obj/item/reagent_containers/spray/waterflower/cyborg/Initialize(mapload)
. = ..()
START_PROCESSING(SSfastprocess, src)
@@ -18,7 +18,7 @@
custom_price = PRICE_CHEAP_AS_FREE
sharpness = SHARP_POINTY
/obj/item/reagent_containers/syringe/Initialize()
/obj/item/reagent_containers/syringe/Initialize(mapload)
. = ..()
if(list_reagents) //syringe starts in inject mode if its already got something inside
mode = SYRINGE_INJECT
+2 -2
View File
@@ -22,7 +22,7 @@
else
return ..()
/obj/structure/reagent_dispensers/Initialize()
/obj/structure/reagent_dispensers/Initialize(mapload)
create_reagents(tank_volume, DRAINABLE | AMOUNT_VISIBLE)
if(reagent_id)
reagents.add_reagent(reagent_id, tank_volume)
@@ -212,7 +212,7 @@
density = FALSE
reagent_id = /datum/reagent/consumable/condensedcapsaicin
/obj/structure/reagent_dispensers/peppertank/Initialize()
/obj/structure/reagent_dispensers/peppertank/Initialize(mapload)
. = ..()
if(prob(1))
desc = "IT'S PEPPER TIME, BITCH!"