no relative pathing (#16234)

* the voices win in the end

* cleanup

* changelog

* secure.dm hates me

* make_exact_fit() in initialize instead of whatever was happening before

code/game/objects/effects/effect_system.dm

@@ -25,18 +25,18 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	var/atom/holder
 	var/setup = 0
 
-	proc/set_up(n = 3, c = 0, turf/loc)
-		if(n > 10)
-			n = 10
-		number = n
-		cardinals = c
-		location = loc
-		setup = 1
+/datum/effect/effect/system/proc/set_up(n = 3, c = 0, turf/loc)
+	if(n > 10)
+		n = 10
+	number = n
+	cardinals = c
+	location = loc
+	setup = 1
 
-	proc/attach(atom/atom)
-		holder = atom
+/datum/effect/effect/system/proc/attach(atom/atom)
+	holder = atom
 
-	proc/start()
+/datum/effect/effect/system/proc/start()
 
 
 /////////////////////////////////////////////
@@ -62,29 +62,29 @@ steam.start() -- spawns the effect
 
 /datum/effect/effect/system/steam_spread
 
-	set_up(n = 3, c = 0, turf/loc)
-		if(n > 10)
-			n = 10
-		number = n
-		cardinals = c
-		location = loc
+/datum/effect/effect/system/steam_spread/set_up(n = 3, c = 0, turf/loc)
+	if(n > 10)
+		n = 10
+	number = n
+	cardinals = c
+	location = loc
 
-	start()
-		var/i = 0
-		for(i=0, i<src.number, i++)
-			spawn(0)
-				if(holder)
-					src.location = get_turf(holder)
-				var/obj/effect/effect/steam/steam = new /obj/effect/effect/steam(src.location)
-				var/direction
-				if(src.cardinals)
-					direction = pick(cardinal)
-				else
-					direction = pick(alldirs)
-				for(i=0, i<pick(1,2,3), i++)
-					sleep(5)
-					step(steam,direction)
-				QDEL_IN(steam, 20)
+/datum/effect/effect/system/steam_spread/start()
+	var/i = 0
+	for(i=0, i<src.number, i++)
+		spawn(0)
+			if(holder)
+				src.location = get_turf(holder)
+			var/obj/effect/effect/steam/steam = new /obj/effect/effect/steam(src.location)
+			var/direction
+			if(src.cardinals)
+				direction = pick(cardinal)
+			else
+				direction = pick(alldirs)
+			for(i=0, i<pick(1,2,3), i++)
+				sleep(5)
+				step(steam,direction)
+			QDEL_IN(steam, 20)
 
 /////////////////////////////////////////////
 //// SMOKE SYSTEMS
@@ -300,96 +300,96 @@ steam.start() -- spawns the effect
 	var/processing = 1
 	var/on = 1
 
-	set_up(atom/atom)
-		attach(atom)
-		oldposition = get_turf(atom)
+/datum/effect/effect/system/steam_trail_follow/set_up(atom/atom)
+	attach(atom)
+	oldposition = get_turf(atom)
 
-	start()
-		if(!src.on)
-			src.on = 1
-			src.processing = 1
-		if(src.processing)
-			src.processing = 0
-			spawn(0)
-				if(src.number < 3)
-					var/obj/effect/effect/steam/I = new /obj/effect/effect/steam(src.oldposition)
-					src.number++
-					src.oldposition = get_turf(holder)
-					I.set_dir(src.holder.dir)
-					spawn(10)
-						qdel(I)
-						src.number--
-					spawn(2)
-						if(src.on)
-							src.processing = 1
-							src.start()
-				else
-					spawn(2)
-						if(src.on)
-							src.processing = 1
-							src.start()
-
-	proc/stop()
+/datum/effect/effect/system/steam_trail_follow/start()
+	if(!src.on)
+		src.on = 1
+		src.processing = 1
+	if(src.processing)
 		src.processing = 0
-		src.on = 0
+		spawn(0)
+			if(src.number < 3)
+				var/obj/effect/effect/steam/I = new /obj/effect/effect/steam(src.oldposition)
+				src.number++
+				src.oldposition = get_turf(holder)
+				I.set_dir(src.holder.dir)
+				spawn(10)
+					qdel(I)
+					src.number--
+				spawn(2)
+					if(src.on)
+						src.processing = 1
+						src.start()
+			else
+				spawn(2)
+					if(src.on)
+						src.processing = 1
+						src.start()
+
+/datum/effect/effect/system/steam_trail_follow/proc/stop()
+	src.processing = 0
+	src.on = 0
 
 /datum/effect/effect/system/reagents_explosion
 	var/amount 						// TNT equivalent
 	var/flashing = 0			// does explosion creates flash effect?
 	var/flashing_factor = 0		// factor of how powerful the flash effect relatively to the explosion
 
-	set_up (amt, loc, flash = 0, flash_fact = 0)
-		amount = amt
-		if(istype(loc, /turf/))
-			location = loc
-		else
-			location = get_turf(loc)
+/datum/effect/effect/system/reagents_explosion/set_up(amt, loc, flash = 0, flash_fact = 0)
+	amount = amt
+	if(istype(loc, /turf/))
+		location = loc
+	else
+		location = get_turf(loc)
 
-		flashing = flash
-		flashing_factor = flash_fact
+	flashing = flash
+	flashing_factor = flash_fact
 
+	return
+
+/datum/effect/effect/system/reagents_explosion/start()
+	if (amount <= 2)
+		spark(location, 2)
+
+		for(var/mob/M in viewers(5, location))
+			to_chat(M, "<span class='warning'>The solution violently explodes.</span>")
+		for(var/mob/M in viewers(1, location))
+			if (prob (50 * amount))
+				to_chat(M, "<span class='warning'>The explosion knocks you down.</span>")
+				M.Weaken(rand(1,5))
 		return
+	else
+		var/devst = -1
+		var/heavy = -1
+		var/light = -1
+		var/flash = -1
 
-	start()
-		if (amount <= 2)
-			spark(location, 2)
+		// Clamp all values to fractions of max_explosion_range, following the same pattern as for tank transfer bombs
+		if (round(amount/12) > 0)
+			devst = devst + amount/12
 
-			for(var/mob/M in viewers(5, location))
-				to_chat(M, "<span class='warning'>The solution violently explodes.</span>")
-			for(var/mob/M in viewers(1, location))
-				if (prob (50 * amount))
-					to_chat(M, "<span class='warning'>The explosion knocks you down.</span>")
-					M.Weaken(rand(1,5))
-			return
-		else
-			var/devst = -1
-			var/heavy = -1
-			var/light = -1
-			var/flash = -1
+		if (round(amount/6) > 0)
+			heavy = heavy + amount/6
 
-			// Clamp all values to fractions of max_explosion_range, following the same pattern as for tank transfer bombs
-			if (round(amount/12) > 0)
-				devst = devst + amount/12
+		if (round(amount/3) > 0)
+			light = light + amount/3
 
-			if (round(amount/6) > 0)
-				heavy = heavy + amount/6
+		if (flashing && flashing_factor)
+			flash = (amount/4) * flashing_factor
 
-			if (round(amount/3) > 0)
-				light = light + amount/3
+		for(var/mob/M in viewers(8, location))
+			to_chat(M, "<span class='warning'>The solution violently explodes.</span>")
 
-			if (flashing && flashing_factor)
-				flash = (amount/4) * flashing_factor
-
-			for(var/mob/M in viewers(8, location))
-				to_chat(M, "<span class='warning'>The solution violently explodes.</span>")
-
-			explosion(
-				location,
-				round(min(devst, BOMBCAP_DVSTN_RADIUS)),
-				round(min(heavy, BOMBCAP_HEAVY_RADIUS)),
-				round(min(light, BOMBCAP_LIGHT_RADIUS)),
-				round(min(flash, BOMBCAP_FLASH_RADIUS))
-				)
+		explosion(
+			location,
+			round(min(devst, BOMBCAP_DVSTN_RADIUS)),
+			round(min(heavy, BOMBCAP_HEAVY_RADIUS)),
+			round(min(light, BOMBCAP_LIGHT_RADIUS)),
+			round(min(flash, BOMBCAP_FLASH_RADIUS))
+			)
 
 /obj/effect/temporary_effect
 	name = "self deleting effect"

code/game/objects/effects/gibs.dm

@@ -10,45 +10,45 @@
 	var/fleshcolor //Used for gibbed humans.
 	var/bloodcolor //Used for gibbed humans.
 
-	Initialize(mapload, list/viruses, datum/dna/MobDNA, fleshcolor, bloodcolor)
-		. = ..()
+/obj/effect/gibspawner/Initialize(mapload, list/viruses, datum/dna/MobDNA, fleshcolor, bloodcolor)
+	. = ..()
 
-		if(fleshcolor) src.fleshcolor = fleshcolor
-		if(bloodcolor) src.bloodcolor = bloodcolor
-		Gib(loc,viruses,MobDNA)
+	if(fleshcolor) src.fleshcolor = fleshcolor
+	if(bloodcolor) src.bloodcolor = bloodcolor
+	Gib(loc,viruses,MobDNA)
 
-	proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null)
-		if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
-			to_world("<span class='warning'>Gib list length mismatch!</span>")
-			return
+/obj/effect/gibspawner/proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null)
+	if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
+		to_world("<span class='warning'>Gib list length mismatch!</span>")
+		return
 
-		var/obj/effect/decal/cleanable/blood/gibs/gib = null
+	var/obj/effect/decal/cleanable/blood/gibs/gib = null
 
-		if(sparks)
-			spark(location, 2, alldirs)
+	if(sparks)
+		spark(location, 2, alldirs)
 
-		for(var/i = 1, i<= gibtypes.len, i++)
-			if(gibamounts[i])
-				for(var/j = 1, j<= gibamounts[i], j++)
-					var/gibType = gibtypes[i]
-					gib = new gibType(location)
+	for(var/i = 1, i<= gibtypes.len, i++)
+		if(gibamounts[i])
+			for(var/j = 1, j<= gibamounts[i], j++)
+				var/gibType = gibtypes[i]
+				gib = new gibType(location)
 
-					// Apply human species colouration to masks.
-					if(fleshcolor)
-						gib.fleshcolor = fleshcolor
-					if(bloodcolor)
-						gib.basecolor = bloodcolor
+				// Apply human species colouration to masks.
+				if(fleshcolor)
+					gib.fleshcolor = fleshcolor
+				if(bloodcolor)
+					gib.basecolor = bloodcolor
 
-					gib.update_icon()
+				gib.update_icon()
 
-					gib.blood_DNA = list()
-					if(MobDNA)
-						gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type
-					else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey
-						gib.blood_DNA["Non-human DNA"] = "A+"
-					if(istype(location,/turf/))
-						var/list/directions = gibdirections[i]
-						if(directions.len)
-							gib.streak(directions)
+				gib.blood_DNA = list()
+				if(MobDNA)
+					gib.blood_DNA[MobDNA.unique_enzymes] = MobDNA.b_type
+				else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey
+					gib.blood_DNA["Non-human DNA"] = "A+"
+				if(istype(location,/turf/))
+					var/list/directions = gibdirections[i]
+					if(directions.len)
+						gib.streak(directions)
 
-		qdel(src)
+	qdel(src)

code/game/objects/effects/step_triggers.dm

@@ -31,54 +31,54 @@
 	var/nostop = 0 // if 1: will only be stopped by teleporters
 	var/list/affecting = list()
 
-	Trigger(var/atom/A)
-		if(!A || !istype(A, /atom/movable))
+/obj/effect/step_trigger/thrower/Trigger(var/atom/A)
+	if(!A || !istype(A, /atom/movable))
+		return
+	var/atom/movable/AM = A
+	var/curtiles = 0
+	var/stopthrow = 0
+	for(var/obj/effect/step_trigger/thrower/T in orange(2, src))
+		if(AM in T.affecting)
 			return
-		var/atom/movable/AM = A
-		var/curtiles = 0
-		var/stopthrow = 0
-		for(var/obj/effect/step_trigger/thrower/T in orange(2, src))
-			if(AM in T.affecting)
-				return
 
-		if(ismob(AM))
-			var/mob/M = AM
-			if(immobilize)
-				M.canmove = 0
+	if(ismob(AM))
+		var/mob/M = AM
+		if(immobilize)
+			M.canmove = 0
 
-		affecting.Add(AM)
-		while(AM && !stopthrow)
-			if(tiles)
-				if(curtiles >= tiles)
-					break
-			if(AM.z != src.z)
+	affecting.Add(AM)
+	while(AM && !stopthrow)
+		if(tiles)
+			if(curtiles >= tiles)
 				break
+		if(AM.z != src.z)
+			break
 
-			curtiles++
+		curtiles++
 
-			sleep(speed)
+		sleep(speed)
 
-			// Calculate if we should stop the process
-			if(!nostop)
-				for(var/obj/effect/step_trigger/T in get_step(AM, dir))
-					if(T.stopper && T != src)
-						stopthrow = 1
-			else
-				for(var/obj/effect/step_trigger/teleporter/T in get_step(AM, dir))
-					if(T.stopper)
-						stopthrow = 1
+		// Calculate if we should stop the process
+		if(!nostop)
+			for(var/obj/effect/step_trigger/T in get_step(AM, dir))
+				if(T.stopper && T != src)
+					stopthrow = 1
+		else
+			for(var/obj/effect/step_trigger/teleporter/T in get_step(AM, dir))
+				if(T.stopper)
+					stopthrow = 1
 
-			if(AM)
-				var/predir = AM.dir
-				step(AM, dir)
-				if(!facedir)
-					AM.set_dir(predir)
+		if(AM)
+			var/predir = AM.dir
+			step(AM, dir)
+			if(!facedir)
+				AM.set_dir(predir)
 
-		affecting.Remove(AM)
-		if(ismob(AM))
-			var/mob/M = AM
-			if(immobilize)
-				M.canmove = 1
+	affecting.Remove(AM)
+	if(ismob(AM))
+		var/mob/M = AM
+		if(immobilize)
+			M.canmove = 1
 
 /obj/effect/step_trigger/thrower/shuttle
 	icon_state = "dir_arrow"
@@ -129,12 +129,12 @@
 	var/teleport_y = 0
 	var/teleport_z = 0
 
-	Trigger(var/atom/movable/A)
-		if(teleport_x && teleport_y && teleport_z)
+/obj/effect/step_trigger/teleporter/Trigger(var/atom/movable/A)
+	if(teleport_x && teleport_y && teleport_z)
 
-			A.x = teleport_x
-			A.y = teleport_y
-			A.z = teleport_z
+		A.x = teleport_x
+		A.y = teleport_y
+		A.z = teleport_z
 
 /* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */
 
@@ -154,4 +154,4 @@
 			A.z = rand(teleport_z, teleport_z_offset)
 			if(isliving(A))
 				var/mob/M = A
-				M.visible_message(FONT_LARGE(SPAN_WARNING("\The [A] blinks into reality!")), FONT_LARGE(SPAN_WARNING("You feel your stomach turn as you get thrown out of bluespace!")))
+				M.visible_message(FONT_LARGE(SPAN_WARNING("\The [A] blinks into reality!")), FONT_LARGE(SPAN_WARNING("You feel your stomach turn as you get thrown out of bluespace!")))

code/game/objects/empulse.dm

@@ -4,7 +4,7 @@
 
 // #define EMPDEBUG 10
 
-proc/empulse(turf/epicenter, heavy_range, light_range, log = FALSE, list/exclude = null)
+/proc/empulse(turf/epicenter, heavy_range, light_range, log = FALSE, list/exclude = null)
 	if(!epicenter) return
 
 	if(!istype(epicenter, /turf))

code/game/objects/items/devices/radio/beacon.dm

@@ -53,9 +53,9 @@ var/global/list/teleportbeacons = list()
 	return
 
 
-/obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy.
-	proc/digest_delay()
-		QDEL_IN(src, 600)
+// Probably a better way of doing this, I'm lazy.
+/obj/item/device/radio/beacon/bacon/proc/digest_delay()
+	QDEL_IN(src, 600)
 
 /obj/item/device/radio/beacon/fixed
 	alpha = 0

code/game/objects/items/weapons/autopsy.dm

@@ -28,14 +28,14 @@
 	var/hits = 0
 	var/time_inflicted = 0
 
-	proc/copy()
-		var/datum/autopsy_data/W = new()
-		W.weapon = weapon
-		W.pretend_weapon = pretend_weapon
-		W.damage = damage
-		W.hits = hits
-		W.time_inflicted = time_inflicted
-		return W
+/datum/autopsy_data/proc/copy()
+	var/datum/autopsy_data/W = new()
+	W.weapon = weapon
+	W.pretend_weapon = pretend_weapon
+	W.damage = damage
+	W.hits = hits
+	W.time_inflicted = time_inflicted
+	return W
 
 /obj/item/autopsy_scanner/proc/add_data(var/obj/item/organ/external/O)
 	if(!O.autopsy_data.len && !O.trace_chemicals.len) return

code/game/objects/items/weapons/chewables.dm

@@ -29,7 +29,7 @@
 		base_overlay.appearance_flags = RESET_COLOR
 		add_overlay(base_overlay)
 
-obj/item/clothing/mask/chewable/Initialize()
+/obj/item/clothing/mask/chewable/Initialize()
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
 	. = ..()
 	flags |= NOREACT // so it doesn't react until you light it
@@ -50,7 +50,7 @@ obj/item/clothing/mask/chewable/Initialize()
 	STOP_PROCESSING(SSprocessing, src)
 	..()
 
-obj/item/clothing/mask/chewable/Destroy()
+/obj/item/clothing/mask/chewable/Destroy()
 	. = ..()
 	STOP_PROCESSING(SSprocessing, src)
 

code/game/objects/items/weapons/circuitboards/machinery/research.dm

@@ -2,7 +2,7 @@
 #error T_BOARD macro is not defined but we need it!
 #endif
 
-obj/item/circuitboard/rdserver
+/obj/item/circuitboard/rdserver
 	name = T_BOARD("R&D server")
 	build_path = /obj/machinery/r_n_d/server
 	board_type = "machine"
@@ -11,7 +11,7 @@ obj/item/circuitboard/rdserver
 							"/obj/item/stack/cable_coil" = 2,
 							"/obj/item/stock_parts/scanning_module" = 1)
 
-obj/item/circuitboard/rdtechprocessor
+/obj/item/circuitboard/rdtechprocessor
 	name = T_BOARD("R&D tech processor")
 	build_path = /obj/machinery/r_n_d/tech_processor
 	board_type = "machine"
@@ -84,7 +84,7 @@ obj/item/circuitboard/rdtechprocessor
 							"/obj/item/stack/cable_coil" = 1,
 							"/obj/item/stock_parts/console_screen" = 1)
 
-obj/item/circuitboard/ntnet_relay
+/obj/item/circuitboard/ntnet_relay
 	name = "Circuit board (NTNet Quantum Relay)"
 	build_path = /obj/machinery/ntnet_relay
 	board_type = "machine"

code/game/objects/items/weapons/dna_injector.dm

@@ -150,9 +150,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = HULKBLOCK
-		..()
+
+/obj/item/dnainjector/hulkmut/New()
+	block = HULKBLOCK
+	..()
 
 /obj/item/dnainjector/antihulk
 	name = "\improper DNA injector (Anti-Hulk)"
@@ -160,9 +161,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = HULKBLOCK
-		..()
+
+/obj/item/dnainjector/antihulk/New()
+	block = HULKBLOCK
+	..()
 
 /obj/item/dnainjector/xraymut
 	name = "\improper DNA injector (Xray)"
@@ -170,9 +172,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 8
-	New()
-		block = XRAYBLOCK
-		..()
+
+/obj/item/dnainjector/xraymut/New()
+	block = XRAYBLOCK
+	..()
 
 /obj/item/dnainjector/antixray
 	name = "\improper DNA injector (Anti-Xray)"
@@ -180,9 +183,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 8
-	New()
-		block = XRAYBLOCK
-		..()
+
+/obj/item/dnainjector/antixray/New()
+	block = XRAYBLOCK
+	..()
 
 /obj/item/dnainjector/firemut
 	name = "\improper DNA injector (Fire)"
@@ -190,9 +194,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 10
-	New()
-		block = FIREBLOCK
-		..()
+
+/obj/item/dnainjector/firemut/New()
+	block = FIREBLOCK
+	..()
 
 /obj/item/dnainjector/antifire
 	name = "\improper DNA injector (Anti-Fire)"
@@ -200,9 +205,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 10
-	New()
-		block = FIREBLOCK
-		..()
+
+/obj/item/dnainjector/antifire/New()
+	block = FIREBLOCK
+	..()
 
 /obj/item/dnainjector/telemut
 	name = "\improper DNA injector (Tele.)"
@@ -210,9 +216,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 12
-	New()
-		block = TELEBLOCK
-		..()
+
+/obj/item/dnainjector/telemut/New()
+	block = TELEBLOCK
+	..()
 
 /obj/item/dnainjector/antitele
 	name = "\improper DNA injector (Anti-Tele.)"
@@ -220,9 +227,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 12
-	New()
-		block = TELEBLOCK
-		..()
+
+/obj/item/dnainjector/antitele/New()
+	block = TELEBLOCK
+	..()
 
 /obj/item/dnainjector/nobreath
 	name = "\improper DNA injector (No Breath)"
@@ -230,9 +238,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = NOBREATHBLOCK
-		..()
+
+/obj/item/dnainjector/nobreath/New()
+	block = NOBREATHBLOCK
+	..()
 
 /obj/item/dnainjector/antinobreath
 	name = "\improper DNA injector (Anti-No Breath)"
@@ -240,9 +249,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = NOBREATHBLOCK
-		..()
+
+/obj/item/dnainjector/antinobreath/New()
+	block = NOBREATHBLOCK
+	..()
 
 /obj/item/dnainjector/remoteview
 	name = "\improper DNA injector (Remote View)"
@@ -250,9 +260,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = REMOTEVIEWBLOCK
-		..()
+
+/obj/item/dnainjector/remoteview/New()
+	block = REMOTEVIEWBLOCK
+	..()
 
 /obj/item/dnainjector/antiremoteview
 	name = "\improper DNA injector (Anti-Remote View)"
@@ -260,9 +271,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = REMOTEVIEWBLOCK
-		..()
+
+/obj/item/dnainjector/antiremoteview/New()
+	block = REMOTEVIEWBLOCK
+	..()
 
 /obj/item/dnainjector/regenerate
 	name = "\improper DNA injector (Regeneration)"
@@ -270,9 +282,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = REGENERATEBLOCK
-		..()
+
+/obj/item/dnainjector/regenerate/New()
+	block = REGENERATEBLOCK
+	..()
 
 /obj/item/dnainjector/antiregenerate
 	name = "\improper DNA injector (Anti-Regeneration)"
@@ -280,9 +293,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = REGENERATEBLOCK
-		..()
+
+/obj/item/dnainjector/antiregenerate/New()
+	block = REGENERATEBLOCK
+	..()
 
 /obj/item/dnainjector/runfast
 	name = "\improper DNA injector (Increase Run)"
@@ -290,9 +304,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = INCREASERUNBLOCK
-		..()
+
+/obj/item/dnainjector/runfast/New()
+	block = INCREASERUNBLOCK
+	..()
 
 /obj/item/dnainjector/antirunfast
 	name = "\improper DNA injector (Anti-Increase Run)"
@@ -300,9 +315,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = INCREASERUNBLOCK
-		..()
+
+/obj/item/dnainjector/antirunfast/New()
+	block = INCREASERUNBLOCK
+	..()
 
 /obj/item/dnainjector/morph
 	name = "\improper DNA injector (Morph)"
@@ -310,9 +326,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = MORPHBLOCK
-		..()
+
+/obj/item/dnainjector/morph/New()
+	block = MORPHBLOCK
+	..()
 
 /obj/item/dnainjector/antimorph
 	name = "\improper DNA injector (Anti-Morph)"
@@ -320,9 +337,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = MORPHBLOCK
-		..()
+
+/obj/item/dnainjector/antimorph/New()
+	block = MORPHBLOCK
+	..()
 
 /* No COLDBLOCK on bay
 /obj/item/dnainjector/cold
@@ -331,9 +349,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = COLDBLOCK
-		..()
+
+/obj/item/dnainjector/cold/New()
+	block = COLDBLOCK
+	..()
 
 /obj/item/dnainjector/anticold
 	name = "\improper DNA injector (Anti-Cold)"
@@ -341,9 +360,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = COLDBLOCK
-		..()
+
+/obj/item/dnainjector/anticold/New()
+	block = COLDBLOCK
+	..()
 */
 
 /obj/item/dnainjector/noprints
@@ -352,9 +372,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = NOPRINTSBLOCK
-		..()
+
+/obj/item/dnainjector/noprints/New()
+	block = NOPRINTSBLOCK
+	..()
 
 /obj/item/dnainjector/antinoprints
 	name = "\improper DNA injector (Anti-No Prints)"
@@ -362,9 +383,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = NOPRINTSBLOCK
-		..()
+
+/obj/item/dnainjector/antinoprints/New()
+	block = NOPRINTSBLOCK
+	..()
 
 /obj/item/dnainjector/insulation
 	name = "\improper DNA injector (Shock Immunity)"
@@ -372,9 +394,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = SHOCKIMMUNITYBLOCK
-		..()
+
+/obj/item/dnainjector/insulation/New()
+	block = SHOCKIMMUNITYBLOCK
+	..()
 
 /obj/item/dnainjector/antiinsulation
 	name = "\improper DNA injector (Anti-Shock Immunity)"
@@ -382,9 +405,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = SHOCKIMMUNITYBLOCK
-		..()
+
+/obj/item/dnainjector/antiinsulation/New()
+	block = SHOCKIMMUNITYBLOCK
+	..()
 
 /obj/item/dnainjector/midgit
 	name = "\improper DNA injector (Small Size)"
@@ -392,9 +416,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = SMALLSIZEBLOCK
-		..()
+
+/obj/item/dnainjector/midgit/New()
+	block = SMALLSIZEBLOCK
+	..()
 
 /obj/item/dnainjector/antimidgit
 	name = "\improper DNA injector (Anti-Small Size)"
@@ -402,9 +427,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = SMALLSIZEBLOCK
-		..()
+
+/obj/item/dnainjector/antimidgit/New()
+	block = SMALLSIZEBLOCK
+	..()
 
 /////////////////////////////////////
 /obj/item/dnainjector/antiglasses
@@ -413,9 +439,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 1
-	New()
-		block = GLASSESBLOCK
-		..()
+
+/obj/item/dnainjector/antiglasses/New()
+	block = GLASSESBLOCK
+	..()
 
 /obj/item/dnainjector/glassesmut
 	name = "\improper DNA injector (Glasses)"
@@ -423,9 +450,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 1
-	New()
-		block = GLASSESBLOCK
-		..()
+
+/obj/item/dnainjector/glassesmut/New()
+	block = GLASSESBLOCK
+	..()
 
 /obj/item/dnainjector/epimut
 	name = "\improper DNA injector (Epi.)"
@@ -433,9 +461,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 3
-	New()
-		block = HEADACHEBLOCK
-		..()
+
+/obj/item/dnainjector/epimut/New()
+	block = HEADACHEBLOCK
+	..()
 
 /obj/item/dnainjector/antiepi
 	name = "\improper DNA injector (Anti-Epi.)"
@@ -443,9 +472,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 3
-	New()
-		block = HEADACHEBLOCK
-		..()
+
+/obj/item/dnainjector/antiepi/New()
+	block = HEADACHEBLOCK
+	..()
 
 /obj/item/dnainjector/anticough
 	name = "\improper DNA injector (Anti-Cough)"
@@ -453,9 +483,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 5
-	New()
-		block = COUGHBLOCK
-		..()
+
+/obj/item/dnainjector/anticough/New()
+	block = COUGHBLOCK
+	..()
 
 /obj/item/dnainjector/coughmut
 	name = "\improper DNA injector (Cough)"
@@ -463,9 +494,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 5
-	New()
-		block = COUGHBLOCK
-		..()
+
+/obj/item/dnainjector/coughmut/New()
+	block = COUGHBLOCK
+	..()
 
 /obj/item/dnainjector/clumsymut
 	name = "\improper DNA injector (Clumsy)"
@@ -473,9 +505,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 6
-	New()
-		block = CLUMSYBLOCK
-		..()
+
+/obj/item/dnainjector/clumsymut/New()
+	block = CLUMSYBLOCK
+	..()
 
 /obj/item/dnainjector/anticlumsy
 	name = "\improper DNA injector (Anti-Clumy)"
@@ -483,9 +516,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 6
-	New()
-		block = CLUMSYBLOCK
-		..()
+
+/obj/item/dnainjector/anticlumsy/New()
+	block = CLUMSYBLOCK
+	..()
 
 /obj/item/dnainjector/antitour
 	name = "\improper DNA injector (Anti-Tour.)"
@@ -493,9 +527,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 7
-	New()
-		block = TWITCHBLOCK
-		..()
+
+/obj/item/dnainjector/antitour/New()
+	block = TWITCHBLOCK
+	..()
 
 /obj/item/dnainjector/tourmut
 	name = "\improper DNA injector (Tour.)"
@@ -503,9 +538,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 7
-	New()
-		block = TWITCHBLOCK
-		..()
+
+/obj/item/dnainjector/tourmut/New()
+	block = TWITCHBLOCK
+	..()
 
 /obj/item/dnainjector/stuttmut
 	name = "\improper DNA injector (Stutt.)"
@@ -513,9 +549,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 9
-	New()
-		block = STUTTERBLOCK
-		..()
+
+/obj/item/dnainjector/stuttmut/New()
+	block = STUTTERBLOCK
+	..()
 
 /obj/item/dnainjector/antistutt
 	name = "\improper DNA injector (Anti-Stutt.)"
@@ -523,9 +560,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 9
-	New()
-		block = STUTTERBLOCK
-		..()
+
+/obj/item/dnainjector/antistutt/New()
+	block = STUTTERBLOCK
+	..()
 
 /obj/item/dnainjector/blindmut
 	name = "\improper DNA injector (Blind)"
@@ -533,9 +571,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 11
-	New()
-		block = BLINDBLOCK
-		..()
+
+/obj/item/dnainjector/blindmut/New()
+	block = BLINDBLOCK
+	..()
 
 /obj/item/dnainjector/antiblind
 	name = "\improper DNA injector (Anti-Blind)"
@@ -543,9 +582,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 11
-	New()
-		block = BLINDBLOCK
-		..()
+
+/obj/item/dnainjector/antiblind/New()
+	block = BLINDBLOCK
+	..()
 
 /obj/item/dnainjector/deafmut
 	name = "\improper DNA injector (Deaf)"
@@ -553,9 +593,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 13
-	New()
-		block = DEAFBLOCK
-		..()
+
+/obj/item/dnainjector/deafmut/New()
+	block = DEAFBLOCK
+	..()
 
 /obj/item/dnainjector/antideaf
 	name = "\improper DNA injector (Anti-Deaf)"
@@ -563,9 +604,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 13
-	New()
-		block = DEAFBLOCK
-		..()
+
+/obj/item/dnainjector/antideaf/New()
+	block = DEAFBLOCK
+	..()
 
 /obj/item/dnainjector/hallucination
 	name = "\improper DNA injector (Halluctination)"
@@ -573,9 +615,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 2
-	New()
-		block = HALLUCINATIONBLOCK
-		..()
+
+/obj/item/dnainjector/hallucination/New()
+	block = HALLUCINATIONBLOCK
+	..()
 
 /obj/item/dnainjector/antihallucination
 	name = "\improper DNA injector (Anti-Hallucination)"
@@ -583,9 +626,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 2
-	New()
-		block = HALLUCINATIONBLOCK
-		..()
+
+/obj/item/dnainjector/antihallucination/New()
+	block = HALLUCINATIONBLOCK
+	..()
 
 /obj/item/dnainjector/h2m
 	name = "\improper DNA injector (Human > Monkey)"
@@ -593,9 +637,10 @@
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 14
-	New()
-		block = MONKEYBLOCK
-		..()
+
+/obj/item/dnainjector/h2m/New()
+	block = MONKEYBLOCK
+	..()
 
 /obj/item/dnainjector/m2h
 	name = "\improper DNA injector (Monkey > Human)"
@@ -603,6 +648,7 @@
 	datatype = DNA2_BUF_SE
 	value = 0x001
 	//block = 14
-	New()
-		block = MONKEYBLOCK
-		..()
+
+/obj/item/dnainjector/m2h/New()
+	block = MONKEYBLOCK
+	..()

code/game/objects/items/weapons/ecigs.dm

@@ -61,7 +61,7 @@
 	. = ..()
 	color = pick(ecig_colors)
 
-obj/item/clothing/mask/smokable/ecig/util/examine(mob/user)
+/obj/item/clothing/mask/smokable/ecig/util/examine(mob/user)
 	. = ..()
 	if(ec_cartridge)
 		to_chat(user, SPAN_NOTICE("There are [round(ec_cartridge.reagents.total_volume, 1)] unit\s of liquid remaining."))
@@ -225,7 +225,7 @@ obj/item/clothing/mask/smokable/ecig/util/examine(mob/user)
 		if(blocked)
 			to_chat(C, SPAN_WARNING("\The [blocked] is in the way!"))
 			return TRUE
-		if(last_drag <= world.time - 30) 
+		if(last_drag <= world.time - 30)
 			if(!cig_cell.checked_use(power_usage * CELLRATE)) //if this passes, there's not enough power in the battery
 				deactivate()
 				to_chat(C,SPAN_WARNING("\The [src]'s power meter flashes a low battery warning and shuts down."))
@@ -234,7 +234,7 @@ obj/item/clothing/mask/smokable/ecig/util/examine(mob/user)
 			idle = 0
 			C.visible_message(SPAN_NOTICE("[C.name] takes a drag of their [name]."))
 			playsound(C, 'sound/items/cigs_lighters/inhale.ogg', 50, 0, -1)
-			ec_cartridge.reagents.trans_to_mob(C, REM, CHEM_BREATHE, 0.4) 
+			ec_cartridge.reagents.trans_to_mob(C, REM, CHEM_BREATHE, 0.4)
 			return TRUE
 	return ..()
 
@@ -295,4 +295,4 @@ obj/item/clothing/mask/smokable/ecig/util/examine(mob/user)
 /obj/item/reagent_containers/ecig_cartridge/coffee
 	name = "coffee flavour cartridge"
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
-	reagents_to_add = list(/singleton/reagent/toxin/tobacco/liquid = 10, /singleton/reagent/water = 10, /singleton/reagent/drink/coffee = 5)
+	reagents_to_add = list(/singleton/reagent/toxin/tobacco/liquid = 10, /singleton/reagent/water = 10, /singleton/reagent/drink/coffee = 5)

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -378,18 +378,18 @@
 	stage = 2
 	path = 1
 
-	Initialize()
-		. = ..()
-		var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
-		var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
+/obj/item/grenade/chem_grenade/monoammoniumphosphate/Initialize()
+	. = ..()
+	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
+	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-		B1.reagents.add_reagent(/singleton/reagent/surfactant, 40)
-		B1.reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, 20)
-		B2.reagents.add_reagent(/singleton/reagent/water, 40)
-		B2.reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, 20)
+	B1.reagents.add_reagent(/singleton/reagent/surfactant, 40)
+	B1.reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, 20)
+	B2.reagents.add_reagent(/singleton/reagent/water, 40)
+	B2.reagents.add_reagent(/singleton/reagent/toxin/fertilizer/monoammoniumphosphate, 20)
 
-		detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
+	detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
 
-		beakers += B1
-		beakers += B2
-		icon_state = initial(icon_state) +"_locked"
+	beakers += B1
+	beakers += B2
+	icon_state = initial(icon_state) +"_locked"

code/game/objects/items/weapons/grenades/fragmentation.dm

@@ -1,4 +1,4 @@
-proc/fragem(var/source,var/fragx,var/fragy,var/light_dam,var/flash_dam,var/p_dam,var/p_range,var/can_cover=TRUE,var/shard_range = 50)
+/proc/fragem(var/source,var/fragx,var/fragy,var/light_dam,var/flash_dam,var/p_dam,var/p_range,var/can_cover=TRUE,var/shard_range = 50)
 	var/turf/O = get_turf(source)
 	var/fragger = rand(fragx,fragy)
 	explosion(O, -1, -1, light_dam, flash_dam)

code/game/objects/items/weapons/power_cells.dm

@@ -125,9 +125,10 @@
 	maxcharge = 30000 //determines how badly mobs get shocked
 	matter = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 80)
 
-	check_charge()
+/obj/item/cell/infinite/check_charge()
 		return 1
-	use()
+
+/obj/item/cell/infinite/use()
 		return 1
 
 /obj/item/cell/potato

code/game/objects/items/weapons/storage/backpack.dm

@@ -94,18 +94,18 @@
 	storage_cost = 29
 	empty_delay = 0.8 SECOND
 
-	attackby(obj/item/W as obj, mob/user as mob)
-		if(istype(W, /obj/item/storage/backpack/holding))
-			to_chat(user, "<span class='warning'>The Bluespace interfaces of the two devices conflict and malfunction.</span>")
-			qdel(W)
-			return
-		..()
+/obj/item/storage/backpack/holding/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/storage/backpack/holding))
+		to_chat(user, "<span class='warning'>The Bluespace interfaces of the two devices conflict and malfunction.</span>")
+		qdel(W)
+		return
+	..()
 
 	//Please don't clutter the parent storage item with stupid hacks.
-	can_be_inserted(obj/item/W as obj, stop_messages = 0)
-		if(istype(W, /obj/item/storage/backpack/holding))
-			return 1
-		return ..()
+/obj/item/storage/backpack/holding/can_be_inserted(obj/item/W as obj, stop_messages = 0)
+	if(istype(W, /obj/item/storage/backpack/holding))
+		return 1
+	return ..()
 
 /obj/item/storage/backpack/santabag
 	name = "\improper Santa's gift bag"

code/game/objects/items/weapons/storage/misc.dm

@@ -70,6 +70,10 @@
 	throwforce = 2
 	slot_flags = SLOT_BELT
 	starts_with = list(/obj/item/paper/cig = 10)
+
+/obj/item/storage/box/fancy/cigpaper/Initialize()
+	. = ..()
+
 	make_exact_fit()
 
 /obj/item/storage/box/fancy/cigpaper/update_icon()
@@ -91,11 +95,15 @@
 		)
 	w_class = ITEMSIZE_SMALL
 	starts_with = list(/obj/item/cigarette_filter = 10)
-	make_exact_fit()
 	drop_sound = 'sound/items/drop/gloves.ogg'
 	pickup_sound = 'sound/items/pickup/gloves.ogg'
 	use_sound = 'sound/items/storage/wrapper.ogg'
 
+/obj/item/storage/cigfilter/Initialize(mapload, defer_shrinkwrap)
+	. = ..()
+
+	make_exact_fit()
+
 /obj/item/storage/box/fancy/cigpaper/fine
 	name = "\improper Trident cigarette paper"
 	desc = "A fancy brand of Trident cigarette paper, for rolling your own cigarettes. Like a person who appreciates the finer things in life."
@@ -122,6 +130,10 @@
 	throwforce = 2
 	slot_flags = SLOT_BELT
 	starts_with = list(/obj/item/clothing/mask/chewable/tobacco = 6)
+
+/obj/item/storage/chewables/Initialize(mapload, defer_shrinkwrap)
+	. = ..()
+
 	make_exact_fit()
 
 /obj/item/storage/chewables/tobacco/bad

code/game/objects/items/weapons/storage/pill_bottle.dm

@@ -73,7 +73,7 @@
 	desc = "Contains pills used to treat minor burns."
 	starts_with = list(/obj/item/reagent_containers/pill/kelotane = 7)
 
-obj/item/storage/pill_bottle/butazoline
+/obj/item/storage/pill_bottle/butazoline
 	name = "bottle of 10u Butazoline pills"
 	desc = "Contains pills used to severe injuries and bleeding."
 	starts_with = list(/obj/item/reagent_containers/pill/butazoline = 7)

code/game/objects/items/weapons/storage/secure.dm

@@ -28,105 +28,105 @@
 	max_storage_space = 16
 	use_sound = 'sound/items/storage/briefcase.ogg'
 
-	examine(mob/user)
-		if(..(user, 1))
-			to_chat(user, text("The service panel is [src.open ? "open" : "closed"]."))
+/obj/item/storage/secure/examine(mob/user)
+	if(..(user, 1))
+		to_chat(user, text("The service panel is [src.open ? "open" : "closed"]."))
 
-	attackby(obj/item/W as obj, mob/user as mob)
-		if(locked)
-			if (istype(W, /obj/item/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]"))
-				var/obj/item/melee/energy/blade/blade = W
-				blade.spark_system.queue()
-				playsound(src.loc, 'sound/weapons/blade.ogg', 50, 1)
-				playsound(src.loc, /singleton/sound_category/spark_sound, 50, 1)
-				return
-
-			if (W.isscrewdriver())
-				if(W.use_tool(src, user, 20, volume = 50))
-					src.open =! src.open
-					to_chat(user, SPAN_NOTICE("You [src.open ? "open" : "close"] the service panel."))
-				return
-			if ((W.ismultitool()) && (src.open == 1)&& (!src.l_hacking))
-				to_chat(user, SPAN_NOTICE("Now attempting to reset internal memory, please hold."))
-				src.l_hacking = 1
-				if (do_after(usr, 100))
-					if (prob(40))
-						src.l_setshort = 1
-						src.l_set = 0
-						to_chat(user, SPAN_NOTICE("Internal memory reset. Please give it a few seconds to reinitialize."))
-						sleep(80)
-						src.l_setshort = 0
-						src.l_hacking = 0
-					else
-						to_chat(user, SPAN_WARNING("Unable to reset internal memory."))
-						src.l_hacking = 0
-				else	src.l_hacking = 0
-				return
-			//At this point you have exhausted all the special things to do when locked
-			// ... but it's still locked.
+/obj/item/storage/secure/attackby(obj/item/W as obj, mob/user as mob)
+	if(locked)
+		if (istype(W, /obj/item/melee/energy/blade) && emag_act(INFINITY, user, "You slice through the lock of \the [src]"))
+			var/obj/item/melee/energy/blade/blade = W
+			blade.spark_system.queue()
+			playsound(src.loc, 'sound/weapons/blade.ogg', 50, 1)
+			playsound(src.loc, /singleton/sound_category/spark_sound, 50, 1)
 			return
 
-		// -> storage/attackby() what with handle insertion, etc
-		..()
-
-
-	MouseDrop(over_object, src_location, over_location)
-		if (locked)
-			src.add_fingerprint(usr)
+		if (W.isscrewdriver())
+			if(W.use_tool(src, user, 20, volume = 50))
+				src.open =! src.open
+				to_chat(user, SPAN_NOTICE("You [src.open ? "open" : "close"] the service panel."))
 			return
-		..()
-
-
-	attack_self(mob/user as mob)
-		user.set_machine(src)
-		var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
-		var/message = "Code"
-		if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
-			dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
-		if (src.emagged)
-			dat += text("<p>\n<font color=red><b>LOCKING SYSTEM ERROR - 1701</b></font>")
-		if (src.l_setshort)
-			dat += text("<p>\n<font color=red><b>ALERT: MEMORY SYSTEM ERROR - 6040 201</b></font>")
-		message = text("[]", src.code)
-		if (!src.locked)
-			message = "*****"
-		dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
-		send_theme_resources(user)
-		user << browse(enable_ui_theme(user, dat), "window=caselock;size=300x280")
-
-	Topic(href, href_list)
-		..()
-		if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
-			return
-		if (href_list["type"])
-			if (href_list["type"] == "E")
-				if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
-					src.l_code = src.code
-					src.l_set = 1
-				else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
-					src.locked = 0
-					cut_overlays()
-					add_overlay(icon_opened)
-					src.code = null
+		if ((W.ismultitool()) && (src.open == 1)&& (!src.l_hacking))
+			to_chat(user, SPAN_NOTICE("Now attempting to reset internal memory, please hold."))
+			src.l_hacking = 1
+			if (do_after(usr, 100))
+				if (prob(40))
+					src.l_setshort = 1
+					src.l_set = 0
+					to_chat(user, SPAN_NOTICE("Internal memory reset. Please give it a few seconds to reinitialize."))
+					sleep(80)
+					src.l_setshort = 0
+					src.l_hacking = 0
 				else
-					src.code = "ERROR"
-			else
-				if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
-					src.locked = 1
-					cut_overlays()
-					src.code = null
-					src.close(usr)
-				else
-					src.code += text("[]", href_list["type"])
-					if (length(src.code) > 5)
-						src.code = "ERROR"
-			src.add_fingerprint(usr)
-			for(var/mob/M in viewers(1, src.loc))
-				if ((M.client && M.machine == src))
-					src.attack_self(M)
-				return
+					to_chat(user, SPAN_WARNING("Unable to reset internal memory."))
+					src.l_hacking = 0
+			else	src.l_hacking = 0
+			return
+		//At this point you have exhausted all the special things to do when locked
+		// ... but it's still locked.
 		return
 
+	// -> storage/attackby() what with handle insertion, etc
+	..()
+
+
+/obj/item/storage/secure/MouseDrop(over_object, src_location, over_location)
+	if (locked)
+		src.add_fingerprint(usr)
+		return
+	..()
+
+
+/obj/item/storage/secure/attack_self(mob/user as mob)
+	user.set_machine(src)
+	var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
+	var/message = "Code"
+	if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
+		dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
+	if (src.emagged)
+		dat += text("<p>\n<font color=red><b>LOCKING SYSTEM ERROR - 1701</b></font>")
+	if (src.l_setshort)
+		dat += text("<p>\n<font color=red><b>ALERT: MEMORY SYSTEM ERROR - 6040 201</b></font>")
+	message = text("[]", src.code)
+	if (!src.locked)
+		message = "*****"
+	dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
+	send_theme_resources(user)
+	user << browse(enable_ui_theme(user, dat), "window=caselock;size=300x280")
+
+/obj/item/storage/secure/Topic(href, href_list)
+	..()
+	if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
+		return
+	if (href_list["type"])
+		if (href_list["type"] == "E")
+			if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
+				src.l_code = src.code
+				src.l_set = 1
+			else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
+				src.locked = 0
+				cut_overlays()
+				add_overlay(icon_opened)
+				src.code = null
+			else
+				src.code = "ERROR"
+		else
+			if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
+				src.locked = 1
+				cut_overlays()
+				src.code = null
+				src.close(usr)
+			else
+				src.code += text("[]", href_list["type"])
+				if (length(src.code) > 5)
+					src.code = "ERROR"
+		src.add_fingerprint(usr)
+		for(var/mob/M in viewers(1, src.loc))
+			if ((M.client && M.machine == src))
+				src.attack_self(M)
+			return
+	return
+
 /obj/item/storage/secure/emag_act(var/remaining_charges, var/mob/user, var/feedback)
 	if(!emagged)
 		emagged = 1
@@ -190,7 +190,7 @@
 	starts_with = list(/obj/item/paper = 1, /obj/item/pen = 1)
 
 /obj/item/storage/secure/safe/attack_hand(mob/user as mob)
-		return attack_self(user)
+	return attack_self(user)
 
 /*obj/item/storage/secure/safe/HoS/New()
 	..()

code/game/objects/random/random.dm

@@ -51,8 +51,9 @@
 	desc = "This item type is used to randomly spawn a given object at round-start"
 	icon_state = "x3"
 	var/spawn_object = null
-	item_to_spawn()
-		return ispath(spawn_object) ? spawn_object : text2path(spawn_object)
+
+/obj/random/single/item_to_spawn()
+	return ispath(spawn_object) ? spawn_object : text2path(spawn_object)
 
 /obj/random/tool
 	name = "random tool"
@@ -1487,46 +1488,47 @@
 		/obj/item/toy/mech/honk
 	)
 	has_postspawn = TRUE
-	post_spawn(obj/thing)
-		var/list/frames = list(
-			/obj/item/gun/custom_ka/frame01 = 1,
-			/obj/item/gun/custom_ka/frame02 = 2,
-			/obj/item/gun/custom_ka/frame03 = 3,
-			/obj/item/gun/custom_ka/frame04 = 2,
-			/obj/item/gun/custom_ka/frame05 = 1
-		)
 
-		var/list/cells = list(
-			/obj/item/custom_ka_upgrade/cells/cell01 = 2,
-			/obj/item/custom_ka_upgrade/cells/cell02 = 3,
-			/obj/item/custom_ka_upgrade/cells/cell03 = 2,
-			/obj/item/custom_ka_upgrade/cells/cell04 = 1,
-			/obj/item/custom_ka_upgrade/cells/cell05 = 1
-		)
+/obj/random/custom_ka/post_spawn(obj/thing)
+	var/list/frames = list(
+		/obj/item/gun/custom_ka/frame01 = 1,
+		/obj/item/gun/custom_ka/frame02 = 2,
+		/obj/item/gun/custom_ka/frame03 = 3,
+		/obj/item/gun/custom_ka/frame04 = 2,
+		/obj/item/gun/custom_ka/frame05 = 1
+	)
 
-		var/list/barrels = list(
-			/obj/item/custom_ka_upgrade/barrels/barrel01 = 2,
-			/obj/item/custom_ka_upgrade/barrels/barrel02 = 3,
-			/obj/item/custom_ka_upgrade/barrels/barrel03 = 2,
-			/obj/item/custom_ka_upgrade/barrels/barrel04 = 1,
-			/obj/item/custom_ka_upgrade/barrels/barrel05 = 1
-		)
+	var/list/cells = list(
+		/obj/item/custom_ka_upgrade/cells/cell01 = 2,
+		/obj/item/custom_ka_upgrade/cells/cell02 = 3,
+		/obj/item/custom_ka_upgrade/cells/cell03 = 2,
+		/obj/item/custom_ka_upgrade/cells/cell04 = 1,
+		/obj/item/custom_ka_upgrade/cells/cell05 = 1
+	)
 
-		var/frame_type = pickweight(frames)
-		var/obj/item/gun/custom_ka/spawned_frame = new frame_type(thing.loc)
+	var/list/barrels = list(
+		/obj/item/custom_ka_upgrade/barrels/barrel01 = 2,
+		/obj/item/custom_ka_upgrade/barrels/barrel02 = 3,
+		/obj/item/custom_ka_upgrade/barrels/barrel03 = 2,
+		/obj/item/custom_ka_upgrade/barrels/barrel04 = 1,
+		/obj/item/custom_ka_upgrade/barrels/barrel05 = 1
+	)
 
-		var/cell_type = pickweight(cells)
-		spawned_frame.installed_cell = new cell_type(spawned_frame)
+	var/frame_type = pickweight(frames)
+	var/obj/item/gun/custom_ka/spawned_frame = new frame_type(thing.loc)
 
-		var/barrel_type = pickweight(barrels)
-		spawned_frame.installed_barrel = new barrel_type(spawned_frame)
+	var/cell_type = pickweight(cells)
+	spawned_frame.installed_cell = new cell_type(spawned_frame)
 
-		spawned_frame.installed_upgrade_chip = new /obj/item/custom_ka_upgrade/upgrade_chips/capacity(spawned_frame)
+	var/barrel_type = pickweight(barrels)
+	spawned_frame.installed_barrel = new barrel_type(spawned_frame)
 
-		spawned_frame.update_icon()
-		spawned_frame.update_stats()
+	spawned_frame.installed_upgrade_chip = new /obj/item/custom_ka_upgrade/upgrade_chips/capacity(spawned_frame)
 
-		qdel(thing)
+	spawned_frame.update_icon()
+	spawned_frame.update_stats()
+
+	qdel(thing)
 
 /obj/random/prebuilt_ka
 	name = "random prebuilt kinetic accelerator"

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -57,79 +57,79 @@
 	U.hidden_uplink.uses = 40
 	return
 
-/obj/structure/closet/syndicate/resources/
+/obj/structure/closet/syndicate/resources
 	desc = "An old, dusty locker."
 
-	fill()
-		var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
-		var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
-		var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
-		var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
+/obj/structure/closet/syndicate/resources/fill()
+	var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
+	var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
+	var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
+	var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
 
-		var/pickednum = rand(1, 50)
+	var/pickednum = rand(1, 50)
 
-		//Sad trombone
-		if(pickednum == 1)
-			var/obj/item/paper/P = new /obj/item/paper(src)
-			P.name = "IOU"
-			P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
+	//Sad trombone
+	if(pickednum == 1)
+		var/obj/item/paper/P = new /obj/item/paper(src)
+		P.name = "IOU"
+		P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
 
-		//Metal (common ore)
-		if(pickednum >= 2)
-			new /obj/item/stack/material/steel(src, rand(common_min, common_max))
+	//Metal (common ore)
+	if(pickednum >= 2)
+		new /obj/item/stack/material/steel(src, rand(common_min, common_max))
 
-		//Glass (common ore)
-		if(pickednum >= 5)
-			new /obj/item/stack/material/glass(src, rand(common_min, common_max))
+	//Glass (common ore)
+	if(pickednum >= 5)
+		new /obj/item/stack/material/glass(src, rand(common_min, common_max))
 
-		//Plasteel (common ore) Because it has a million more uses then phoron
-		if(pickednum >= 10)
-			new /obj/item/stack/material/plasteel(src, rand(common_min, common_max))
+	//Plasteel (common ore) Because it has a million more uses then phoron
+	if(pickednum >= 10)
+		new /obj/item/stack/material/plasteel(src, rand(common_min, common_max))
 
-		//Phoron (rare ore)
-		if(pickednum >= 15)
-			new /obj/item/stack/material/phoron(src, rand(rare_min, rare_max))
+	//Phoron (rare ore)
+	if(pickednum >= 15)
+		new /obj/item/stack/material/phoron(src, rand(rare_min, rare_max))
 
-		//Silver (rare ore)
-		if(pickednum >= 20)
-			new /obj/item/stack/material/silver(src, rand(rare_min, rare_max))
+	//Silver (rare ore)
+	if(pickednum >= 20)
+		new /obj/item/stack/material/silver(src, rand(rare_min, rare_max))
 
-		//Gold (rare ore)
-		if(pickednum >= 30)
-			new /obj/item/stack/material/gold(src, rand(rare_min, rare_max))
+	//Gold (rare ore)
+	if(pickednum >= 30)
+		new /obj/item/stack/material/gold(src, rand(rare_min, rare_max))
 
-		//Uranium (rare ore)
-		if(pickednum >= 40)
-			new /obj/item/stack/material/uranium(src, rand(rare_min, rare_max))
+	//Uranium (rare ore)
+	if(pickednum >= 40)
+		new /obj/item/stack/material/uranium(src, rand(rare_min, rare_max))
 
-		//Diamond (rare HONK)
-		if(pickednum >= 45)
-			new /obj/item/stack/material/diamond(src, rand(rare_min, rare_max))
+	//Diamond (rare HONK)
+	if(pickednum >= 45)
+		new /obj/item/stack/material/diamond(src, rand(rare_min, rare_max))
 
-		//Jetpack (You hit the jackpot!)
-		if(pickednum == 50)
-			new /obj/item/tank/jetpack/carbondioxide(src)
+	//Jetpack (You hit the jackpot!)
+	if(pickednum == 50)
+		new /obj/item/tank/jetpack/carbondioxide(src)
 
-		return
+	return
 
 /obj/structure/closet/syndicate/resources/everything
 	desc = "It's an emergency storage closet for repairs."
 
-	fill()
-		var/list/resources = list(
-			/obj/item/stack/material/steel,
-			/obj/item/stack/material/glass,
-			/obj/item/stack/material/gold,
-			/obj/item/stack/material/silver,
-			/obj/item/stack/material/phoron,
-			/obj/item/stack/material/uranium,
-			/obj/item/stack/material/diamond,
-			/obj/item/stack/material/plasteel,
-			/obj/item/stack/rods
-		)
+/obj/structure/closet/syndicate/resources/everything/fill()
+	var/list/resources = list(
+		/obj/item/stack/material/steel,
+		/obj/item/stack/material/glass,
+		/obj/item/stack/material/gold,
+		/obj/item/stack/material/silver,
+		/obj/item/stack/material/phoron,
+		/obj/item/stack/material/uranium,
+		/obj/item/stack/material/diamond,
+		/obj/item/stack/material/plasteel,
+		/obj/item/stack/rods
+	)
 
 
-		for(var/i = 0, i<2, i++)
-			for(var/res in resources)
-				var/obj/item/stack/R = new res(src)
-				R.amount = R.max_amount
+	for(var/i = 0, i<2, i++)
+		for(var/res in resources)
+			var/obj/item/stack/R = new res(src)
+			R.amount = R.max_amount

code/game/objects/structures/crates_lockers/crates.dm

@@ -311,18 +311,18 @@
 	var/target_temp = T0C - 40
 	var/cooling_power = 40
 
-	return_air()
-		var/datum/gas_mixture/gas = (..())
-		if(!gas)	return null
-		var/datum/gas_mixture/newgas = new/datum/gas_mixture()
-		newgas.copy_from(gas)
-		if(newgas.temperature <= target_temp)	return
+/obj/structure/closet/crate/freezer/return_air()
+	var/datum/gas_mixture/gas = (..())
+	if(!gas)	return null
+	var/datum/gas_mixture/newgas = new/datum/gas_mixture()
+	newgas.copy_from(gas)
+	if(newgas.temperature <= target_temp)	return
 
-		if((newgas.temperature - cooling_power) > target_temp)
-			newgas.temperature -= cooling_power
-		else
-			newgas.temperature = target_temp
-		return newgas
+	if((newgas.temperature - cooling_power) > target_temp)
+		newgas.temperature -= cooling_power
+	else
+		newgas.temperature = target_temp
+	return newgas
 
 /obj/structure/closet/crate/freezer/rations //For use in the escape shuttle
 	name = "emergency rations"
@@ -507,17 +507,17 @@
 	icon_state = "hydro_crate"
 
 /obj/structure/closet/crate/hydroponics/prespawned
-	//This exists so the prespawned hydro crates spawn with their contents.
 
-	fill()
-		new /obj/item/reagent_containers/spray/plantbgone(src)
-		new /obj/item/reagent_containers/spray/plantbgone(src)
-		new /obj/item/material/minihoe(src)
-//		new /obj/item/weedspray(src)
-//		new /obj/item/weedspray(src)
-//		new /obj/item/pestspray(src)
-//		new /obj/item/pestspray(src)
-//		new /obj/item/pestspray(src)
+//This exists so the prespawned hydro crates spawn with their contents.
+/obj/structure/closet/crate/hydroponics/prespawned/fill()
+	new /obj/item/reagent_containers/spray/plantbgone(src)
+	new /obj/item/reagent_containers/spray/plantbgone(src)
+	new /obj/item/material/minihoe(src)
+//	new /obj/item/weedspray(src)
+//	new /obj/item/weedspray(src)
+//	new /obj/item/pestspray(src)
+//	new /obj/item/pestspray(src)
+//	new /obj/item/pestspray(src)
 
 
 

code/game/objects/structures/grille.dm

@@ -244,10 +244,11 @@
 	destroyed = 1
 	icon_state = "grille-b"
 	density = 0
-	New()
-		..()
-		health = rand(-5, -1) //In the destroyed but not utterly threshold.
-		healthcheck() //Send this to healthcheck just in case we want to do something else with it.
+
+/obj/structure/grille/broken/New()
+	..()
+	health = rand(-5, -1) //In the destroyed but not utterly threshold.
+	healthcheck() //Send this to healthcheck just in case we want to do something else with it.
 
 /obj/structure/grille/diagonal
 	icon_state = "grille_diagonal"

code/game/objects/structures/windoor_assembly.dm

@@ -9,7 +9,7 @@
  */
 
 
-obj/structure/windoor_assembly
+/obj/structure/windoor_assembly
 	name = "windoor assembly"
 	icon = 'icons/obj/doors/windoor.dmi'
 	icon_state = "l_windoor_assembly01"
@@ -40,7 +40,7 @@ obj/structure/windoor_assembly
 
 	update_nearby_tiles(need_rebuild=1)
 
-obj/structure/windoor_assembly/Destroy()
+/obj/structure/windoor_assembly/Destroy()
 	density = 0
 	update_nearby_tiles()
 	return ..()