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] cleans up INIT (#10164)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-14 21:40:43 -07:00
committed by GitHub
parent a71b34b7e0
commit e4f07e43f3
38 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/technomancer/spells/chroma.dm
View File

@@ -24,7 +24,7 @@
invisibility = 101
time_to_die = 2 MINUTES //Despawn after this time, if set.
/obj/effect/temporary_effect/chroma/Initialize(var/mapload, var/new_color = "#FFFFFF")
/obj/effect/temporary_effect/chroma/Initialize(mapload, var/new_color = "#FFFFFF")
. = ..()
set_light(6, 5, l_color = new_color)

2
code/game/machinery/computer/ai_core.dm
View File

@@ -11,7 +11,7 @@
var/obj/item/mmi/brain = null
// VOREstation edit: Respect map config's default
/obj/structure/AIcore/Initialize(var/mapload)
/obj/structure/AIcore/Initialize(mapload)
. = ..()
if(mapload)
laws = new global.using_map.default_law_type

2
code/game/machinery/machinery.dm
View File

@@ -128,7 +128,7 @@ Class Procs:
if(ispath(circuit))
circuit = new circuit(src)
/obj/machinery/Initialize(var/mapload)
/obj/machinery/Initialize(mapload)
. = ..()
SSmachines.all_machines += src
if(ispath(circuit))

2
code/game/machinery/pipe/construction.dm
View File

@@ -38,7 +38,7 @@ Buildable meters
* @param loc Location
* @pipe_type
*/
/obj/item/pipe/Initialize(var/mapload, var/_pipe_type, var/_dir, var/obj/machinery/atmospherics/make_from)
/obj/item/pipe/Initialize(mapload, var/_pipe_type, var/_dir, var/obj/machinery/atmospherics/make_from)
if(make_from)
make_from_existing(make_from)
else

2
code/game/machinery/upgrade_machinery.dm
View File

@@ -1,5 +1,5 @@
// Handles automagically upgrades to machines based on components placed on a machine during map init
/obj/machinery/Initialize(var/mapload)
/obj/machinery/Initialize(mapload)
. = ..()
// Handles automagically upgrades to machines based on components placed on a machine during map init
if(mapload)

4
code/game/objects/effects/alien/aliens.dm
View File

@@ -38,7 +38,7 @@
var/obj/effect/alien/weeds/node/linked_node = null
var/static/list/weedImageCache
/obj/effect/alien/weeds/Initialize(var/mapload, var/node) // CHOMPedit: No coloration.
/obj/effect/alien/weeds/Initialize(mapload, var/node, var/newcolor)
. = ..()
if(isspace(loc))
return INITIALIZE_HINT_QDEL
@@ -75,7 +75,7 @@
var/node_range = NODERANGE
// var/set_color = "#321D37" // CHOMPedit: Removing coloration.
/obj/effect/alien/weeds/node/Initialize(var/mapload, var/node) // CHOMPedit: Removing coloration.
/obj/effect/alien/weeds/node/Initialize(mapload, var/node, var/newcolor)
. = ..()
for(var/obj/effect/alien/weeds/existing in loc)

2
code/game/objects/effects/chem/foam.dm
View File

@@ -17,7 +17,7 @@
var/dries = 1 //VOREStation Add
var/slips = 0 //VOREStation Add
/obj/effect/effect/foam/Initialize(var/mapload, var/ismetal = 0)
/obj/effect/effect/foam/Initialize(mapload, var/ismetal = 0)
. = ..()
//icon_state = "[ismetal? "m" : ""]foam" //VOREStation Removal
metal = ismetal

2
code/game/objects/effects/decals/Cleanable/humans.dm
View File

@@ -51,7 +51,7 @@ var/global/list/image/splatter_cache=list()
qdel(B)
//VOREstation edit - Moved timer call to Init, and made it not call on mapload
/obj/effect/decal/cleanable/blood/Initialize(var/mapload, var/_age)
/obj/effect/decal/cleanable/blood/Initialize(mapload, var/_age)
. = ..()
if(!mapload)
addtimer(CALLBACK(src, PROC_REF(dry)), DRYING_TIME * (amount+1))

2
code/game/objects/effects/decals/Cleanable/misc.dm
View File

@@ -38,7 +38,7 @@
icon_state = "dirt"
mouse_opacity = 0
/obj/effect/decal/cleanable/dirt/Initialize(var/mapload, var/_age, var/dirt)
/obj/effect/decal/cleanable/dirt/Initialize(mapload, var/_age, var/dirt)
.=..()
var/turf/simulated/our_turf = src.loc
if(our_turf && istype(our_turf) && our_turf.can_dirty)

2
code/game/objects/effects/decals/cleanable.dm
View File

@@ -13,7 +13,7 @@ generic_filth = TRUE means when the decal is saved, it will be switched out for
var/age = 0
var/list/random_icon_states = list()
/obj/effect/decal/cleanable/Initialize(var/mapload, var/_age)
/obj/effect/decal/cleanable/Initialize(mapload, var/_age)
if(!isnull(_age))
age = _age
if(random_icon_states && length(src.random_icon_states) > 0)

4
code/game/objects/effects/decals/crayon.dm
View File

@@ -9,7 +9,7 @@
var/art_color
var/art_shade
/obj/effect/decal/cleanable/crayon/Initialize(var/ml, main = "#FFFFFF",shade = "#000000",var/type = "rune", new_age = 0)
/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF",shade = "#000000",var/type = "rune", new_age = 0)
name = type
desc = "A [type] drawn in crayon."
@@ -24,7 +24,7 @@
if("graffiti")
type = pick("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa")
. = ..(ml, new_age) // mapload, age
. = ..(mapload, new_age) // mapload, age
/obj/effect/decal/cleanable/crayon/update_icon()
cut_overlays()

4
code/game/objects/effects/decals/posters/posters.dm
View File

@@ -18,7 +18,7 @@
var/decl/poster/poster_decl = null
var/poster_type = /obj/structure/sign/poster
/obj/item/poster/Initialize(var/mapload, var/decl/poster/poster_decl = null)
/obj/item/poster/Initialize(mapload, var/decl/poster/poster_decl = null)
if(ispath(src.poster_decl))
src.poster_decl = get_poster_decl(src.poster_decl, TRUE)
else if(istype(poster_decl))
@@ -126,7 +126,7 @@
var/roll_type = /obj/item/poster
var/ruined = FALSE
/obj/structure/sign/poster/Initialize(var/newloc, var/placement_dir = null, var/obj/item/poster/P = null)
/obj/structure/sign/poster/Initialize(mapload, var/placement_dir = null, var/obj/item/poster/P = null)
. = ..()
if(ispath(src.poster_decl))

2
code/game/objects/items/devices/uplink.dm
View File

@@ -27,7 +27,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
/obj/item/uplink/Initialize(var/mapload)
/obj/item/uplink/Initialize(mapload)
. = ..()
addtimer(CALLBACK(src, PROC_REF(next_offer)), offer_time) //It seems like only the /hidden type actually makes use of this...

8
code/game/objects/items/stacks/sandbags.dm
View File

@@ -32,8 +32,8 @@
bag_material = MAT_SYNCLOTH
/obj/item/stack/sandbags/Initialize(var/ml, var/amt, var/bag_mat)
. = ..(ml, amt)
/obj/item/stack/sandbags/Initialize(mapload, var/amt, var/bag_mat)
. = ..(mapload, amt)
recipes = sandbag_recipes
update_icon()
if(bag_mat)
@@ -132,8 +132,8 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \
var/bag_material = MAT_CLOTH
/obj/item/stack/emptysandbag/Initialize(var/ml, var/amt, var/bag_mat)
. = ..(ml, amt)
/obj/item/stack/emptysandbag/Initialize(mapload, var/amt, var/bag_mat)
. = ..(mapload, amt)
if(bag_mat)
bag_material = bag_mat
var/datum/material/M = get_material_by_name("[bag_material]")

2
code/game/objects/items/stacks/stack.dm
View File

@@ -30,7 +30,7 @@
var/pass_color = FALSE // Will the item pass its own color var to the created item? Dyed cloth, wood, etc.
var/strict_color_stacking = FALSE // Will the stack merge with other stacks that are different colors? (Dyed cloth, wood, etc)
/obj/item/stack/Initialize(var/ml, var/starting_amount)
/obj/item/stack/Initialize(mapload, var/starting_amount)
. = ..()
if(!stacktype)
stacktype = type

2
code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
View File

@@ -1,4 +1,4 @@
/obj/structure/closet/debug/Initialize(var/maploading, var/newappearance)
/obj/structure/closet/debug/Initialize(mapload, var/newappearance)
closet_appearance = newappearance
. = ..()

2
code/game/objects/structures/extinguisher.dm
View File

@@ -9,7 +9,7 @@
var/obj/item/extinguisher/has_extinguisher
var/opened = 0
/obj/structure/extinguisher_cabinet/Initialize(var/mapload, var/dir, var/building = 0)
/obj/structure/extinguisher_cabinet/Initialize(mapload, var/dir, var/building = 0)
. = ..()
if(building)

2
code/game/objects/structures/ghost_pods/ghost_pods_vr.dm
View File

@@ -52,7 +52,7 @@
if(notify)
trigger()
/obj/structure/ghost_pod/ghost_activated/Initialize(var/mapload)
/obj/structure/ghost_pod/ghost_activated/Initialize(mapload)
. = ..()
if(!mapload)
ghostpod_startup(spawn_active)

2
code/game/objects/structures/low_wall.dm
View File

@@ -28,7 +28,7 @@
var/datum/material/material
var/grille_type
/obj/structure/low_wall/Initialize(var/mapload, var/materialtype)
/obj/structure/low_wall/Initialize(mapload, var/materialtype)
. = ..()
icon_state = "blank"
var/turf/T = loc

16
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -23,8 +23,8 @@
var/applies_material_colour = 1
var/flippable = TRUE
/obj/structure/bed/Initialize(var/newloc, var/new_material, var/new_padding_material)
..(newloc)
/obj/structure/bed/Initialize(mapload, var/new_material, var/new_padding_material)
..()
color = null
if(!new_material)
new_material = MAT_STEEL
@@ -203,19 +203,19 @@
icon_state = "psychbed"
base_icon = "psychbed"
/obj/structure/bed/psych/Initialize(var/newloc)
. = ..(newloc,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/psych/Initialize(mapload)
. = ..(mapload,MAT_WOOD,MAT_LEATHER)
/obj/structure/bed/padded/Initialize(var/newloc)
. = ..(newloc,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/padded/Initialize(mapload)
. = ..(mapload,MAT_PLASTIC,MAT_COTTON)
/obj/structure/bed/double
name = "double bed"
icon_state = "doublebed"
base_icon = "doublebed"
/obj/structure/bed/double/padded/Initialize(var/newloc)
. = ..(newloc,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/padded/Initialize(mapload)
. = ..(mapload,MAT_WOOD,MAT_COTTON)
/obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
if(M.buckled == src)

96
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
View File

@@ -9,7 +9,7 @@
buckle_lying = 0 //force people to sit up in chairs when buckled
var/propelled = 0 // Check for fire-extinguisher-driven chairs
/obj/structure/bed/chair/Initialize(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..()
update_layer()
@@ -127,38 +127,38 @@
I.color = padding_material.icon_colour
add_overlay(I)
/obj/structure/bed/chair/comfy/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/red/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/teal/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/black/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/green/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/purp/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/purp/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/blue/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/beige/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/lime/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/orange/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/orange/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded
name = "rounded chair"
@@ -166,38 +166,38 @@
icon_state = "roundedchair"
base_icon = "roundedchair"
/obj/structure/bed/chair/comfy/rounded/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/rounded/brown/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_LEATHER)
/obj/structure/bed/chair/comfy/rounded/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/red/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CARPET)
/obj/structure/bed/chair/comfy/rounded/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/teal/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/comfy/rounded/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/black/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/comfy/rounded/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/green/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/comfy/rounded/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/purple/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/comfy/rounded/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/blue/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/comfy/rounded/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/beige/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/comfy/rounded/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/lime/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_LIME)
/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/comfy/rounded/orange/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/comfy/rounded/orange/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_ORANGE)
/obj/structure/bed/chair/office
anchored = FALSE
@@ -277,8 +277,8 @@
return
..()
/obj/structure/bed/chair/wood/Initialize(var/newloc)
. = ..(newloc, MAT_WOOD)
/obj/structure/bed/chair/wood/Initialize(mapload)
. = ..(mapload, MAT_WOOD)
/obj/structure/bed/chair/wood/wings
icon_state = "wooden_chair_wings"
@@ -364,7 +364,7 @@
color = null
var/padding_color = "#CC0000"
/obj/structure/bed/chair/sofa/bench/Initialize(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/sofa/bench/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..()
var/mutable_appearance/MA
// If we're north-facing, metal goes above mob, padding overlay goes below mob.

90
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
View File

@@ -25,7 +25,7 @@
base_icon = "modern_chair"
applies_material_colour = 0
/obj/structure/bed/chair/modern_chair/Initialize(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/modern_chair/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..()
var/image/I = image(icon, "[base_icon]_over")
I.layer = ABOVE_MOB_LAYER
@@ -141,35 +141,35 @@
base_icon = "bay_chair"
buckle_movable = 1
/obj/structure/bed/chair/bay/chair/padded/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/chair/padded/red/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/chair/padded/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/chair/padded/brown/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/chair/padded/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/chair/padded/teal/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/chair/padded/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/chair/padded/black/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/chair/padded/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/chair/padded/green/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/chair/padded/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/chair/padded/purple/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/chair/padded/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/chair/padded/blue/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/chair/padded/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/chair/padded/beige/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/chair/padded/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/chair/padded/lime/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/chair/padded/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy
name = "comfy mounted chair"
@@ -177,35 +177,35 @@
icon_state = "bay_comfychair_preview"
base_icon = "bay_comfychair"
/obj/structure/bed/chair/bay/comfy/red/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/comfy/red/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CARPET)
/obj/structure/bed/chair/bay/comfy/brown/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/comfy/brown/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_LEATHER)
/obj/structure/bed/chair/bay/comfy/teal/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/comfy/teal/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_TEAL)
/obj/structure/bed/chair/bay/comfy/black/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/comfy/black/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLACK)
/obj/structure/bed/chair/bay/comfy/green/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/comfy/green/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_GREEN)
/obj/structure/bed/chair/bay/comfy/purple/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/comfy/purple/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_PURPLE)
/obj/structure/bed/chair/bay/comfy/blue/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/blue/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/beige/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/comfy/beige/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_BEIGE)
/obj/structure/bed/chair/bay/comfy/lime/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/comfy/lime/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_LIME)
/obj/structure/bed/chair/bay/comfy/yellow/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/yellow/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, new_material, MAT_CLOTH_YELLOW)
/obj/structure/bed/chair/bay/comfy/captain
name = "captain chair"
@@ -220,8 +220,8 @@
I.layer = ABOVE_MOB_LAYER
add_overlay(I)
/obj/structure/bed/chair/bay/comfy/captain/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/comfy/captain/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, MAT_CLOTH_BLUE)
/obj/structure/bed/chair/bay/shuttle
name = "shuttle seat"
@@ -232,8 +232,8 @@
var/buckling_sound = 'sound/effects/metal_close.ogg'
var/padding = MAT_CLOTH_BLUE
/obj/structure/bed/chair/bay/shuttle/Initialize(var/newloc, var/new_material, var/new_padding_material)
. = ..(newloc, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..(mapload, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/post_buckle_mob()
playsound(src,buckling_sound,75,1)

2
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
View File

@@ -13,7 +13,7 @@
var/min_mob_buckle_size = MOB_SMALL
var/max_mob_buckle_size = MOB_LARGE
/obj/structure/bed/chair/wheelchair/Initialize(var/newloc, var/new_material, var/new_padding_material)
/obj/structure/bed/chair/wheelchair/Initialize(mapload, var/new_material, var/new_padding_material)
. = ..()
update_icon()

2
code/modules/hydroponics/grown.dm
View File

@@ -15,7 +15,7 @@
var/potency = -1
/obj/item/reagent_containers/food/snacks/grown/Initialize(var/mapload, var/planttype)
/obj/item/reagent_containers/food/snacks/grown/Initialize(mapload, var/planttype)
. = ..()
if(!dried_type)

2
code/modules/hydroponics/seed_packets.dm
View File

@@ -13,7 +13,7 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
var/datum/seed/seed
var/modified = 0
/obj/item/seeds/Initialize(var/ml, var/_seed_type)
/obj/item/seeds/Initialize(mapload, var/_seed_type)
if(_seed_type in SSplants.seeds)
seed_type = _seed_type
update_seed()

2
code/modules/mining/mine_items.dm
View File

@@ -161,7 +161,7 @@
item_state = "whiteshovel"
var/datum/material/material
/obj/item/shovel/wood/Initialize(var/ml, var/_mat)
/obj/item/shovel/wood/Initialize(mapload, var/_mat)
. = ..()
material = get_material_by_name(_mat)
if(!istype(material))

4
code/modules/mining/shelter_atoms_vr.dm
View File

@@ -260,8 +260,8 @@ GLOBAL_LIST_EMPTY(unique_deployable)
icon = 'icons/obj/survival_pod.dmi'
icon_state = "bed"
/obj/structure/bed/pod/Initialize(var/newloc)
. = ..(newloc, MAT_STEEL, MAT_COTTON)
/obj/structure/bed/pod/Initialize(mapload)
. = ..(mapload, MAT_STEEL, MAT_COTTON)
//Survival Storage Unit
/obj/machinery/smartfridge/survival_pod

4
code/modules/mob/living/bot/farmbot.dm
View File

@@ -23,8 +23,8 @@
var/obj/structure/reagent_dispensers/watertank/tank
/mob/living/bot/farmbot/Initialize(var/newloc, var/newTank)
. = ..(newloc)
/mob/living/bot/farmbot/Initialize(mapload, var/newTank)
. = ..()
if(!newTank)
newTank = new /obj/structure/reagent_dispensers/watertank(src)
tank = newTank

68
code/modules/mob/living/carbon/human/human_species.dm
View File

@@ -64,87 +64,87 @@
/mob/living/carbon/human/dummy/mannequin/autoequip/tajaran
icon = 'icons/mob/human_races/r_tajaran.dmi'
/mob/living/carbon/human/dummy/mannequin/autoequip/tajaran/Initialize(var/new_loc)
/mob/living/carbon/human/dummy/mannequin/autoequip/tajaran/Initialize(mapload)
h_style = "Tajaran Ears"
return ..(new_loc, SPECIES_TAJARAN)
return ..(mapload, SPECIES_TAJARAN)
/mob/living/carbon/human/dummy/mannequin/autoequip/unathi
icon = 'icons/mob/human_races/r_lizard.dmi'
/mob/living/carbon/human/dummy/mannequin/autoequip/unathi/Initialize(var/new_loc)
/mob/living/carbon/human/dummy/mannequin/autoequip/unathi/Initialize(mapload)
h_style = "Unathi Horns"
return ..(new_loc, SPECIES_UNATHI)
return ..(mapload, SPECIES_UNATHI)
/mob/living/carbon/human/dummy/mannequin/autoequip/sergal
icon = 'modular_chomp/icons/mob/human_races/r_sergal.dmi' //ChompEDIT - our icons
/mob/living/carbon/human/dummy/mannequin/autoequip/sergal/Initialize(var/new_loc)
/mob/living/carbon/human/dummy/mannequin/autoequip/sergal/Initialize(mapload)
h_style = "Sergal Ears"
return ..(new_loc, SPECIES_SERGAL)
return ..(mapload, SPECIES_SERGAL)
/mob/living/carbon/human/dummy/mannequin/autoequip/vulpkanin
icon = 'icons/mob/human_races/r_vulpkanin.dmi'
/mob/living/carbon/human/dummy/mannequin/autoequip/vulpkanin/Initialize(var/new_loc)
/mob/living/carbon/human/dummy/mannequin/autoequip/vulpkanin/Initialize(mapload)
h_style = "vulpkanin, dual-color"
return ..(new_loc, SPECIES_VULPKANIN)
return ..(mapload, SPECIES_VULPKANIN)
/mob/living/carbon/human/dummy/mannequin/autoequip/teshari
icon = 'icons/mob/human_races/r_teshari.dmi'
/mob/living/carbon/human/dummy/mannequin/autoequip/teshari/Initialize(var/new_loc)
/mob/living/carbon/human/dummy/mannequin/autoequip/teshari/Initialize(mapload)
//h_style = "teshari, dual-color"
return ..(new_loc, SPECIES_TESHARI)
return ..(mapload, SPECIES_TESHARI)
/mob/living/carbon/human/skrell/Initialize(var/new_loc)
/mob/living/carbon/human/skrell/Initialize(mapload)
h_style = "Skrell Short Tentacles"
return ..(new_loc, SPECIES_SKRELL)
return ..(mapload, SPECIES_SKRELL)
/mob/living/carbon/human/tajaran/Initialize(var/new_loc)
/mob/living/carbon/human/tajaran/Initialize(mapload)
h_style = "Tajaran Ears"
return ..(new_loc, SPECIES_TAJARAN)
return ..(mapload, SPECIES_TAJARAN)
/mob/living/carbon/human/unathi/Initialize(var/new_loc)
/mob/living/carbon/human/unathi/Initialize(mapload)
h_style = "Unathi Horns"
return ..(new_loc, SPECIES_UNATHI)
return ..(mapload, SPECIES_UNATHI)
/mob/living/carbon/human/vox/Initialize(var/new_loc)
/mob/living/carbon/human/vox/Initialize(mapload)
h_style = "Short Vox Quills"
return ..(new_loc, SPECIES_VOX)
return ..(mapload, SPECIES_VOX)
/mob/living/carbon/human/diona/Initialize(var/new_loc)
return ..(new_loc, SPECIES_DIONA)
/mob/living/carbon/human/diona/Initialize(mapload)
return ..(mapload, SPECIES_DIONA)
/mob/living/carbon/human/teshari/Initialize(var/new_loc)
/mob/living/carbon/human/teshari/Initialize(mapload)
h_style = "Teshari Default"
return ..(new_loc, SPECIES_TESHARI)
return ..(mapload, SPECIES_TESHARI)
/mob/living/carbon/human/promethean/Initialize(var/new_loc)
return ..(new_loc, SPECIES_PROMETHEAN)
/mob/living/carbon/human/promethean/Initialize(mapload)
return ..(mapload, SPECIES_PROMETHEAN)
/mob/living/carbon/human/zaddat/Initialize(var/new_loc)
return ..(new_loc, SPECIES_ZADDAT)
/mob/living/carbon/human/zaddat/Initialize(mapload)
return ..(mapload, SPECIES_ZADDAT)
/mob/living/carbon/human/monkey
low_sorting_priority = TRUE
/mob/living/carbon/human/monkey/Initialize(var/new_loc)
. = ..(new_loc, SPECIES_MONKEY)
/mob/living/carbon/human/monkey/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY)
species.produceCopy(species.traits.Copy(),src,null,FALSE)
/mob/living/carbon/human/farwa
low_sorting_priority = TRUE
/mob/living/carbon/human/farwa/Initialize(var/new_loc)
. = .. (new_loc, SPECIES_MONKEY_TAJ)
/mob/living/carbon/human/farwa/Initialize(mapload)
. = .. (mapload, SPECIES_MONKEY_TAJ)
species.produceCopy(species.traits.Copy(),src,null,FALSE)
/mob/living/carbon/human/neaera
low_sorting_priority = TRUE
/mob/living/carbon/human/neaera/Initialize(var/new_loc)
. = ..(new_loc, SPECIES_MONKEY_SKRELL)
/mob/living/carbon/human/neaera/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY_SKRELL)
species.produceCopy(species.traits.Copy(),src,null,FALSE)
/mob/living/carbon/human/stok
low_sorting_priority = TRUE
/mob/living/carbon/human/stok/Initialize(var/new_loc)
. = ..(new_loc, SPECIES_MONKEY_UNATHI)
/mob/living/carbon/human/stok/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY_UNATHI)
species.produceCopy(species.traits.Copy(),src,null,FALSE)

16
code/modules/mob/living/carbon/human/species/station/monkey_vr.dm
View File

@@ -68,27 +68,27 @@
/mob/living/carbon/human/sharkm
low_sorting_priority = TRUE
/mob/living/carbon/human/sharkm/Initialize(var/new_loc)
. = ..(new_loc, SPECIES_MONKEY_AKULA)
/mob/living/carbon/human/sharkm/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY_AKULA)
species.produceCopy(species.traits.Copy(),src,null,FALSE)
/mob/living/carbon/human/sergallingm
low_sorting_priority = TRUE
/mob/living/carbon/human/sergallingm/Initialize(var/new_loc)
. = ..(new_loc, SPECIES_MONKEY_SERGAL)
/mob/living/carbon/human/sergallingm/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY_SERGAL)
species.produceCopy(species.traits.Copy(),src,null,FALSE)
/mob/living/carbon/human/sparram
low_sorting_priority = TRUE
/mob/living/carbon/human/sparram/Initialize(var/new_loc)
. = ..(new_loc, SPECIES_MONKEY_NEVREAN)
/mob/living/carbon/human/sparram/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY_NEVREAN)
species.produceCopy(species.traits.Copy(),src,null,FALSE)
/mob/living/carbon/human/wolpin
low_sorting_priority = TRUE
/mob/living/carbon/human/wolpin/Initialize(var/new_loc)
. = ..(new_loc, SPECIES_MONKEY_VULPKANIN)
/mob/living/carbon/human/wolpin/Initialize(mapload)
. = ..(mapload, SPECIES_MONKEY_VULPKANIN)
species.produceCopy(species.traits.Copy(),src,null,FALSE)

2
code/modules/mob/living/silicon/robot/subtypes/thinktank/_thinktank.dm
View File

@@ -64,7 +64,7 @@
if(mind)
mind.name = real_name
/mob/living/silicon/robot/platform/Initialize(var/mapload)
/mob/living/silicon/robot/platform/Initialize(mapload)
. = ..()
if(!mmi)
mmi = new /obj/item/mmi/digital/robot(src)

2
code/modules/overmap/bluespace_rift_vr.dm
View File

@@ -9,7 +9,7 @@
var/obj/effect/overmap/bluespace_rift/partner
var/paused
/obj/effect/overmap/bluespace_rift/Initialize(var/mapload, var/new_partner)
/obj/effect/overmap/bluespace_rift/Initialize(mapload, var/new_partner)
. = ..()
if(new_partner)
pair(new_partner)

2
code/modules/power/lightswitch_vr.dm
View File

@@ -58,7 +58,7 @@
var/x_offset = 26
var/y_offset = 26
/obj/structure/construction/Initialize(var/mapload, var/ndir, var/building = FALSE)
/obj/structure/construction/Initialize(mapload, var/ndir, var/building = FALSE)
. = ..()
if(ndir)
set_dir(ndir)

4
code/modules/power/smes_construction.dm
View File

@@ -122,14 +122,14 @@
// Proc: New()
// Parameters: None
// Description: Adds standard components for this SMES, and forces recalculation of properties.
/obj/machinery/power/smes/buildable/Initialize(var/install_coils = 1)
/obj/machinery/power/smes/buildable/Initialize(mapload)
. = ..()
component_parts = list()
component_parts += new /obj/item/stack/cable_coil(src,30)
wires = new /datum/wires/smes(src)
// Allows for mapped-in SMESs with larger capacity/IO
if(install_coils)
if(mapload)
for(var/i = 1, i <= cur_coils, i++)
component_parts += new /obj/item/smes_coil(src)
recalc_coils()

2
code/modules/random_map/drop/droppod_doors.dm
View File

@@ -10,7 +10,7 @@
var/deploying
var/deployed
/obj/structure/droppod_door/Initialize(var/mapload, var/autoopen)
/obj/structure/droppod_door/Initialize(mapload, var/autoopen)
. = ..()
if(autoopen)
addtimer(CALLBACK(src, PROC_REF(deploy)), 10 SECONDS)

2
code/modules/vore/eating/leave_remains_vr.dm
View File

@@ -126,7 +126,7 @@
drop_sound = 'sound/items/drop/device.ogg' //not organic bones, so they get different sounds
pickup_sound = 'sound/items/pickup/device.ogg'
/obj/item/digestion_remains/Initialize(var/mapload, var/mob/living/pred, var/mob/living/prey) //CHOMPEdit
/obj/item/digestion_remains/Initialize(mapload, var/mob/living/pred, var/mob/living/prey) //CHOMPEdit
. = ..()
if(!mapload)
pred_ckey = pred?.ckey

4
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -902,8 +902,8 @@
slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi',
)
/obj/item/material/twohanded/fluff/Initialize(var/newloc)
. = ..(newloc," ") //See materials_vr_dmi for more information as to why this is a blank space.
/obj/item/material/twohanded/fluff/Initialize(mapload)
. = ..(mapload," ") //See materials_vr_dmi for more information as to why this is a blank space.
//jacknoir413:Areax Third
/obj/item/melee/baton/fluff/stunstaff

2
maps/submaps/_helpers.dm
View File

@@ -54,7 +54,7 @@
var/obj/structure/fake_stairs/target //Don't set this manually, let it do it!
var/stepoff_dir
/obj/structure/fake_stairs/Initialize(var/mapload)
/obj/structure/fake_stairs/Initialize(mapload)
. = ..()
for(var/obj/structure/fake_stairs/FS in world)