Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user