Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

code/game/area/Space_Station_13_areas.dm

@@ -126,7 +126,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	ambientsounds = RUINS
 	area_flags = UNIQUE_AREA | NO_ALERTS
 
-/area/asteroid/artifactroom/Initialize()
+/area/asteroid/artifactroom/Initialize(mapload)
 	. = ..()
 	set_dynamic_lighting()
 

code/game/area/ai_monitored.dm

@@ -31,6 +31,6 @@
 			cam.lostTargetRef(WEAKREF(O))
 			return
 
-/area/ai_monitored/turret_protected/ai/Initialize()
+/area/ai_monitored/turret_protected/ai/Initialize(mapload)
 	. = ..()
 	src.area_flags |= ABDUCTOR_PROOF

code/game/area/areas.dm

@@ -41,7 +41,7 @@
 
 	///Will objects this area be needing power?
 	var/requires_power = TRUE
-	/// This gets overridden to 1 for space in area/Initialize().
+	/// This gets overridden to 1 for space in area/Initialize(mapload).
 	var/always_unpowered = FALSE
 
 	var/power_equip = TRUE
@@ -197,7 +197,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
  *
  * returns INITIALIZE_HINT_LATELOAD
  */
-/area/Initialize()
+/area/Initialize(mapload)
 	icon_state = ""
 	map_name = name // Save the initial (the name set in the map) name of the area.
 	canSmoothWithAreas = typecacheof(canSmoothWithAreas)

code/game/area/areas/centcom.dm

@@ -59,7 +59,7 @@
 	icon_state = "supplypod_loading"
 	var/loading_id = ""
 
-/area/centcom/supplypod/loading/Initialize()
+/area/centcom/supplypod/loading/Initialize(mapload)
 	. = ..()
 	if(!loading_id)
 		CRASH("[type] created without a loading_id")

code/game/area/areas/edina.dm

@@ -169,7 +169,7 @@
 	name = "planet z helper"
 	layer = POINT_LAYER
 
-/obj/effect/mapping_helpers/planet_z/Initialize()
+/obj/effect/mapping_helpers/planet_z/Initialize(mapload)
 	. = ..()
 	var/datum/space_level/S = SSmapping.get_level(z)
 	S.traits["Planet"] = TRUE //This probably doesn't work as I expect. But maybe!!

code/game/area/areas/holodeck.dm

@@ -14,7 +14,7 @@
 	Asserts are to avoid the inevitable infinite loops
 */
 
-/area/holodeck/Initialize()
+/area/holodeck/Initialize(mapload)
 	. = ..()
 	var/list/update_holodeck_cache = SSholodeck?.rejected_areas[type]
 	if(update_holodeck_cache)

code/game/area/areas/shuttles.dm

@@ -15,7 +15,7 @@
 	// area_limited_icon_smoothing = /area/shuttle
 	sound_environment = SOUND_ENVIRONMENT_ROOM
 
-/area/shuttle/Initialize()
+/area/shuttle/Initialize(mapload)
 	if(!canSmoothWithAreas)
 		canSmoothWithAreas = type
 	. = ..()