A bunch of Initialize()s now have return values

2017-04-25 03:51:57 -05:00
parent 306e7c1cba
commit d931e5801c
39 changed files with 59 additions and 51 deletions
@@ -42,6 +42,5 @@
 			var/mob/living/buckled_mob = m
 			buckled_mob.electrocute_act(85, src, 1)
 			to_chat(buckled_mob, "<span class='userdanger'>You feel a deep shock course through your body!</span>")
-			spawn(1)
-				buckled_mob.electrocute_act(85, src, 1)
+			addtimer(CALLBACK(buckled_mob, /mob/living.proc/electrocute_act, 85, src, 1), 1)
 	visible_message("<span class='danger'>The electric chair went off!</span>", "<span class='italics'>You hear a deep sharp shock!</span>")
@@ -19,8 +19,7 @@

 /obj/structure/fireaxecabinet/Destroy()
 	if(fireaxe)
-		qdel(fireaxe)
-		fireaxe = null
+		QDEL_NULL(fireaxe)
 	return ..()

 /obj/structure/fireaxecabinet/attackby(obj/item/I, mob/user, params)
@@ -18,7 +18,7 @@
 	//	flags = CONDUCT

 /obj/structure/lattice/Initialize(mapload)
-	..()
+	. = ..()
 	for(var/obj/structure/lattice/LAT in loc)
 		if(LAT != src)
 			QDEL_IN(LAT, 0)
@@ -7,7 +7,7 @@


 /mob/living/carbon/human/virtual_reality/Initialize()
-	..()
+	. = ..()
 	quit_action = new()
 	quit_action.Grant(src)

@@ -106,7 +106,7 @@ Difficulty: Very Hard
 	var/target

 /obj/effect/overlay/temp/at_shield/Initialize(mapload, new_target)
-	..()
+	. = ..()
 	target = new_target
 	INVOKE_ASYNC(src, /atom/movable/proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE)

@@ -628,7 +628,7 @@ Difficulty: Very Hard
 	var/heal_power = 5

 /mob/living/simple_animal/hostile/lightgeist/Initialize()
-	..()
+	. = ..()
 	verbs -= /mob/living/verb/pulled
 	verbs -= /mob/verb/me_verb
 	var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
@@ -54,7 +54,7 @@ Difficulty: Medium
 	death_sound = 'sound/magic/demon_dies.ogg'

 /mob/living/simple_animal/hostile/megafauna/dragon/Initialize()
-	..()
+	. = ..()
 	internal = new/obj/item/device/gps/internal/dragon(src)

 /mob/living/simple_animal/hostile/megafauna/dragon/ex_act(severity, target)
@@ -97,7 +97,7 @@ Difficulty: Medium
 	pixel_z = 500

 /obj/effect/overlay/temp/fireball/Initialize(loc)
-	..()
+	. = ..()
 	animate(src, pixel_z = 0, time = 12)

 /obj/effect/overlay/temp/target
@@ -122,7 +122,7 @@ Difficulty: Medium
 	return

 /obj/effect/overlay/temp/target/Initialize(loc)
-	..()
+	. = ..()
 	INVOKE_ASYNC(src, .proc/fall)

 /obj/effect/overlay/temp/target/proc/fall()
@@ -74,7 +74,7 @@ Difficulty: Hard
 	death_sound = 'sound/magic/Repulse.ogg'

 /mob/living/simple_animal/hostile/megafauna/hierophant/Initialize()
-	..()
+	. = ..()
 	internal = new/obj/item/device/gps/internal/hierophant(src)
 	spawned_beacon = new(loc)

@@ -51,7 +51,7 @@ Difficulty: Medium
 	mouse_opacity = 1

 /mob/living/simple_animal/hostile/megafauna/legion/Initialize()
-	..()
+	. = ..()
 	internal = new/obj/item/device/gps/internal/legion(src)

 /mob/living/simple_animal/hostile/megafauna/legion/AttackingTarget()
@@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa


 /mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize()
-	..()
+	. = ..()
 	swarmer_caps = GLOB.AISwarmerCapsByType //for admin-edits
 	internal = new/obj/item/device/gps/internal/swarmer_beacon(src)
 	for(var/ddir in GLOB.cardinal)
@@ -109,7 +109,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa


 /mob/living/simple_animal/hostile/swarmer/ai/Initialize()
-	..()
+	. = ..()
 	ToggleLight() //so you can see them eating you out of house and home/shooting you/stunlocking you for eternity
 	LAZYINITLIST(GLOB.AISwarmersByType[type])
 	GLOB.AISwarmers += src
@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa


 /mob/living/simple_animal/hostile/swarmer/ai/resource/Initialize()
-	..()
+	. = ..()
 	sharedWanted = typecacheof(sharedWanted)
 	sharedIgnore = typecacheof(sharedIgnore)

@@ -26,7 +26,7 @@
 	gold_core_spawnable = 1

 /mob/living/simple_animal/hostile/retaliate/frog/Initialize()
-	..()
+	. = ..()
 	if(prob(1))
 		name = "rare frog"
 		desc = "It seems a little smug."
@@ -39,7 +39,7 @@
 	var/random = TRUE //if you want random names for ghosts or not

 /mob/living/simple_animal/hostile/retaliate/ghost/Initialize()
-	..()
+	. = ..()
 	if(!random)
 		give_hair()
 	else
@@ -0,0 +1,10 @@
+diff a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm	(rejected hunks)
+@@ -92,7 +92,7 @@
+ 	create_reagents(100)
+ 	set_colour(new_colour)
+ 	grant_language(/datum/language/slime)
+-	..()
+	. = ..()
+ 
+ /mob/living/simple_animal/slime/proc/set_colour(new_colour)
+ 	colour = new_colour
@@ -19,7 +19,7 @@
 	var/slowdown_open = 1

 /obj/item/device/modular_computer/laptop/Initialize()
-	..()
+	. = ..()

 	// No running around with open laptops in hands.
 	SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
@@ -32,7 +32,7 @@


 /obj/structure/filingcabinet/Initialize(mapload)
-	..()
+	. = ..()
 	if(mapload)
 		for(var/obj/item/I in loc)
 			if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo))
@@ -15,7 +15,7 @@
 	var/obj/item/weapon/pen/bin_pen

 /obj/item/weapon/paper_bin/Initialize(mapload)
-	..()
+	. = ..()
 	if(!mapload)
 		return
 	var/obj/item/weapon/pen/P = locate(/obj/item/weapon/pen) in src.loc
@@ -14,7 +14,7 @@
 	var/obj/item/weapon/paper/internalPaper

 /obj/item/weapon/paperplane/Initialize(mapload, obj/item/weapon/paper/newPaper)
-	..()
+	. = ..()
 	pixel_y = rand(-8, 8)
 	pixel_x = rand(-9, 9)
 	if(newPaper)
@@ -172,7 +172,7 @@
 	terminal.master = src

 /obj/machinery/power/apc/Initialize(mapload)
-	..()
+	. = ..()
 	if(!mapload)
 		return
 	has_electronics = 2 //installed and secured
@@ -28,7 +28,7 @@


 /obj/machinery/power/generator/Initialize(mapload)
-	..()
+	. = ..()
 	var/obj/machinery/atmospherics/components/binary/circulator/circpath = /obj/machinery/atmospherics/components/binary/circulator
 	cold_circ = locate(circpath) in get_step(src, cold_dir)
 	hot_circ = locate(circpath) in get_step(src, hot_dir)
@@ -98,7 +98,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
 //

 /obj/machinery/gravity_generator/main/station/Initialize()
-	..()
+	. = ..()
 	setup_parts()
 	middle.add_overlay("activated")
 	update_list()
@@ -60,7 +60,7 @@
 	var/current_heat = 0

 /obj/machinery/power/port_gen/pacman/Initialize()
-	..()
+	. = ..()
 	if(anchored)
 		connect_to_network()

@@ -34,7 +34,7 @@
 		/obj/item/stack/sheet/mineral/uranium = 10) // We have no Pu-238, and this is the closest thing to it.

 /obj/machinery/power/rtg/Initialize()
-	..()
+	. = ..()
 	connect_to_network()

 /obj/machinery/power/rtg/process()
@@ -88,7 +88,7 @@
 		rotate()

 /obj/machinery/power/emitter/Initialize()
-	..()
+	. = ..()
 	if(state == 2 && anchored)
 		connect_to_network()

@@ -282,7 +282,7 @@
 	var/list/connected_panels = list()

 /obj/machinery/power/solar_control/Initialize()
-	..()
+	. = ..()
 	if(powernet)
 		set_panels(currentdir)
 	connect_to_network()
@@ -86,7 +86,7 @@
 							/obj/item/weapon/stock_parts/manipulator = 6)

 /obj/machinery/power/compressor/Initialize()
-	..()
+	. = ..()
 	locate_machinery()
 	if(!turbine)
 		stat |= BROKEN
@@ -202,7 +202,7 @@
 							/obj/item/weapon/stock_parts/capacitor = 6)

 /obj/machinery/power/turbine/Initialize()
-	..()
+	. = ..()
 	locate_machinery()
 	if(!compressor)
 		stat |= BROKEN
@@ -338,7 +338,7 @@


 /obj/machinery/computer/turbine_computer/Initialize()
-	..()
+	. = ..()
 	locate_machinery()

 /obj/machinery/computer/turbine_computer/locate_machinery()
@@ -15,7 +15,7 @@
 	var/slowdown_when_ready = 2

 /obj/item/weapon/gun/ballistic/bow/Initialize(mapload)
-	..()
+	. = ..()
 	SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)

 /obj/item/weapon/gun/ballistic/bow/update_icon()
@@ -42,7 +42,7 @@
 	range = 10

 /obj/item/projectile/energy/net/Initialize()
-	..()
+	. = ..()
 	SpinAnimation()

 /obj/item/projectile/energy/net/on_hit(atom/target, blocked = 0)
@@ -61,11 +61,11 @@
 	desc = "A field of bluespace energy, locking on to teleport a target."
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "dragnetfield"
+	light_range = 3
 	anchored = 1

 /obj/effect/nettingportal/Initialize()
-	..()
-	set_light(3)
+	. = ..()
 	var/obj/item/device/radio/beacon/teletarget = null
 	for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
 		if(com.target)
@@ -214,7 +214,7 @@
 /obj/machinery/conveyor_switch/Initialize(mapload, newid)
 	if(mapload)
 		return TRUE	//need machines list
-	..()
+	. = ..()
 	if(!id)
 		id = newid
 	update()
@@ -38,7 +38,7 @@
 	heat_gen /= max(1, tot_rating)

 /obj/machinery/r_n_d/server/Initialize(mapload)
-	..()
+	. = ..()
 	if(!files) files = new /datum/research(src)
 	var/list/temp_list
 	if(!id_with_upload.len)
@@ -137,7 +137,7 @@
 	server_id = -1

 /obj/machinery/r_n_d/server/centcom/Initialize()
-	..()
+	. = ..()
 	fix_noid_research_servers()

 /proc/fix_noid_research_servers()
@@ -8,7 +8,7 @@
 /mob/camera/aiEye/remote/xenobio/Initialize()
 	var/area/A = get_area(loc)
 	allowed_area = A.name
-	..()
+	. = ..()

 /mob/camera/aiEye/remote/xenobio/setLoc(var/t)
 	var/area/new_area = get_area(t)
@@ -7,7 +7,7 @@
 	var/baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface

 /obj/effect/baseturf_helper/Initialize()
-	..()
+	. = ..()
 	var/area/thearea = get_area(src)
 	for(var/turf/T in get_area_turfs(thearea, z))
 		if(T.baseturf != T.type) //Don't break indestructible walls and the like
@@ -34,7 +34,7 @@

 	SSshuttle.arrivals = src

-	..()
+	. = ..()

 	areas = list()

@@ -450,7 +450,7 @@
 	// Minimal distance from the map edge, setting this too low can result in shuttle landing on the edge and getting "sliced"

 /obj/docking_port/stationary/random/Initialize(mapload)
-	..()
+	. = ..()
 	if(!mapload)
 		return

@@ -241,7 +241,7 @@
 	. = ..()

 /obj/docking_port/mobile/Initialize(mapload)
-	..()
+	. = ..()

 	var/area/A = get_area(src)
 	if(istype(A, /area/shuttle))
@@ -316,7 +316,7 @@
 	if(!check_dock(S))
 		testing("check_dock failed on request for [src]")
 		return
-	
+
 	if(mode == SHUTTLE_IGNITING && destination == S)
 		return

@@ -85,7 +85,7 @@
 	var/static/active_phylacteries = 0

 /obj/item/phylactery/Initialize(mapload, datum/mind/newmind)
-	..()
+	. = ..()
 	mind = newmind
 	name = "phylactery of [mind.name]"

@@ -74,7 +74,7 @@
 	var/walks_left = 50 //prevents the game from hanging in extreme cases (such as minigun fire)

 /obj/effect/cross_action/spacetime_dist/Initialize(mapload)
-	..()
+	. = ..()
 	sound = "sound/guitar/[safepick(GLOB.guitar_notes)]"
 	dir = pick(GLOB.cardinal)

@@ -170,7 +170,7 @@
 			plants_max = G.plant_count
 			dna_max = G.human_count
 			break
-	..()
+	. = ..()

 /obj/machinery/dna_vault/Destroy()
 	for(var/V in fillers)
@@ -12,7 +12,7 @@
 	var/starting_organ

 /obj/item/device/autosurgeon/Initialize(mapload)
-	..()
+	. = ..()
 	if(starting_organ)
 		insert_organ(new starting_organ(src))

@@ -46,7 +46,7 @@
 	to_chat(user, "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots.")

 /obj/machinery/computer/telescience/Initialize(mapload)
-	..()
+	. = ..()
 	if(mapload)
 		for(var/i = 1; i <= starting_crystals; i++)
 			crystals += new /obj/item/weapon/ore/bluespace_crystal/artificial(null) // starting crystals
@@ -8,7 +8,7 @@
 	var/floorbuffer = FALSE

 /obj/vehicle/janicart/Initialize(mapload)
-	..()
+	. = ..()
 	update_icon()

 /obj/vehicle/janicart/Destroy()