Merge pull request #4766 from out-of-phaze/codequality/spawn-qdel

Fix miscellaneous code quality and consistency issues

code/_onclick/hud/screen/screen_credits.dm

@@ -18,15 +18,17 @@
 	animate(src, transform = M, time = CREDIT_ROLL_SPEED)
 	target = M
 	animate(src, alpha = 255, time = CREDIT_EASE_DURATION, flags = ANIMATION_PARALLEL)
-	spawn(CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION)
-		if(!QDELETED(src))
-			animate(src, alpha = 0, transform = target, time = CREDIT_EASE_DURATION)
-			sleep(CREDIT_EASE_DURATION)
-			qdel(src)
+	addtimer(CALLBACK(src, PROC_REF(ease_out)), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION)
 	var/mob/owner = owner_ref?.resolve()
 	if(istype(owner) && owner.client)
 		owner.client.screen += src
 
+/obj/screen/credit/proc/ease_out()
+	if(QDELETED(src))
+		return
+	animate(src, alpha = 0, transform = target, time = CREDIT_EASE_DURATION)
+	QDEL_IN_CLIENT_TIME(src, CREDIT_EASE_DURATION)
+
 /obj/screen/credit/Destroy()
 	var/client/P = parent
 	if(istype(P))

code/controllers/subsystems/garbage.dm

@@ -279,13 +279,13 @@ SUBSYSTEM_DEF(garbage)
 	qdel(D, force)
 #endif
 
-// Should be treated as a replacement for the 'del' keyword.
-// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
+/// Should be treated as a replacement for the 'del' keyword.
+/// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
+/// Non-datums passed to this will be hard-deleted.
 /proc/qdel(datum/D, force=FALSE)
 	if(isnull(D))
 		return
 	if(!istype(D))
-		PRINT_STACK_TRACE("qdel() can only handle /datum (sub)types, was passed: [log_info_line(D)]")
 		del(D)
 		return
 	var/datum/qdel_item/I = SSgarbage.items[D.type]

code/controllers/subsystems/mapping.dm

@@ -196,7 +196,7 @@ SUBSYSTEM_DEF(mapping)
 	. = list()
 	for(var/template_type in subtypesof(/datum/map_template))
 		var/datum/map_template/template = template_type
-		if(!TYPE_IS_ABSTRACT(template) && initial(template.template_parent_type) != template_type && initial(template.name))
+		if(!TYPE_IS_ABSTRACT(template))
 			. += new template_type(type) // send name as a param to catch people doing illegal ad hoc creation
 
 /datum/controller/subsystem/mapping/proc/get_template(var/template_name)

code/controllers/subsystems/shuttle.dm

@@ -125,13 +125,14 @@ SUBSYSTEM_DEF(shuttle)
 
 /datum/controller/subsystem/shuttle/proc/initialize_shuttle(var/shuttle_type, var/map_hash, var/list/add_args)
 	var/datum/shuttle/shuttle = shuttle_type
-	if(initial(shuttle.category) != shuttle_type)
-		var/list/shuttle_args = list(map_hash)
-		if(length(add_args))
-			shuttle_args += add_args
-		shuttle = new shuttle(arglist(shuttle_args))
-		shuttle_areas |= shuttle.shuttle_area
-		return shuttle
+	if(TYPE_IS_ABSTRACT(shuttle))
+		return null
+	var/list/shuttle_args = list(map_hash)
+	if(length(add_args))
+		shuttle_args += add_args
+	shuttle = new shuttle(arglist(shuttle_args))
+	shuttle_areas |= shuttle.shuttle_area
+	return shuttle
 
 /datum/controller/subsystem/shuttle/proc/hook_up_motherships(shuttles_list)
 	for(var/datum/shuttle/S in shuttles_list)

code/datums/traits/maluses/amputations.dm

@@ -15,8 +15,6 @@
 			if(trait_type == type)
 				continue
 			var/decl/trait/malus/amputation/trait = check_traits[trait_type]
-			if(!trait.name)
-				continue // remove when abstract decl handling from dev is merged
 			for(var/limb in trait.apply_to_limbs)
 				if(limb in ban_traits_relating_to_limbs)
 					LAZYDISTINCTADD(incompatible_with, trait_type)

code/game/objects/effects/chem/water.dm

@@ -45,8 +45,7 @@
 				break
 
 		sleep(delay)
-	sleep(10)
-	qdel(src)
+	QDEL_IN(src, 1 SECOND)
 
 /obj/effect/effect/water/Move(turf/newloc)
 	if(newloc.density)

code/game/objects/effects/mines.dm

@@ -34,16 +34,14 @@
 	if(ismob(obj))
 		var/mob/mob = obj
 		mob.add_genetic_condition(pick(decls_repository.get_decls_of_type(/decl/genetic_condition/disability)))
-	spawn(0)
-		qdel(src)
+	qdel(src)
 
 /obj/effect/mine/proc/triggerstun(obj)
 	if(ismob(obj))
 		var/mob/M = obj
 		SET_STATUS_MAX(M, STAT_STUN, 30)
 	spark_at(src, cardinal_only = TRUE)
-	spawn(0)
-		qdel(src)
+	qdel(src)
 
 /obj/effect/mine/proc/triggern2o(obj)
 	//example: n2o triggerproc
@@ -53,30 +51,26 @@
 		if(target.simulated && !target.blocks_air)
 			target.assume_gas(/decl/material/gas/nitrous_oxide, 30)
 
-	spawn(0)
-		qdel(src)
+	qdel(src)
 
 /obj/effect/mine/proc/triggerflame(obj)
 	for (var/turf/target in range(1,src))
 		if(target.simulated && !target.blocks_air)
 			target.assume_gas(/decl/material/gas/hydrogen, 30)
 			target.hotspot_expose(1000, CELL_VOLUME)
 
-	spawn(0)
-		qdel(src)
+	qdel(src)
 
 /obj/effect/mine/proc/triggerkick(obj)
 	spark_at(src, cardinal_only = TRUE)
 	if(ismob(obj))
 		var/mob/victim = obj
 		qdel(victim.client)
-	spawn(0)
-		qdel(src)
+	qdel(src)
 
 /obj/effect/mine/proc/explode(obj)
 	explosion(loc, 0, 1, 2, 3)
-	spawn(0)
-		qdel(src)
+	qdel(src)
 
 /obj/effect/mine/dnascramble
 	name = "Radiation Mine"

code/game/objects/effects/temporary.dm

@@ -5,7 +5,7 @@
 	layer = ABOVE_HUMAN_LAYER
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 	simulated = FALSE
-	var/duration = 10 //in deciseconds
+	var/duration = 1 SECOND //in deciseconds
 
 /obj/effect/temp_visual/Initialize(mapload, set_dir)
 	if(set_dir)
@@ -17,9 +17,15 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "empdisable"
 
+/obj/effect/temp_visual/emppulse
+	name = "electromagnetic pulse"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "emppulse"
+	duration = 2 SECONDS
+
 /obj/effect/temp_visual/bloodsplatter
 	icon = 'icons/effects/bloodspatter.dmi'
-	duration = 5
+	duration = 0.5 SECONDS
 	layer = LYING_HUMAN_LAYER
 	var/splatter_type = "splatter"
 

code/game/objects/empulse.dm

@@ -14,13 +14,7 @@
 		log_and_message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
 
 	if(heavy_range > 1)
-		var/obj/effect/overlay/pulse = new/obj/effect/overlay(epicenter)
-		pulse.icon = 'icons/effects/effects.dmi'
-		pulse.icon_state = "emppulse"
-		pulse.SetName("electromagnetic pulse")
-		pulse.anchored = TRUE
-		spawn(20)
-			qdel(pulse)
+		new /obj/effect/temp_visual/emppulse(epicenter)
 
 	if(heavy_range > light_range)
 		light_range = heavy_range

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

@@ -18,5 +18,4 @@
 /obj/item/grenade/anti_photon/proc/finish()
 	set_light(10, 10, rgb(rand(64,255), rand(64,255), rand(64,255)))
 	playsound(loc, 'sound/effects/bang.ogg', 50, 1, 5)
-	sleep(1 SECOND)
-	qdel(src)
+	QDEL_IN(src, 1 SECOND)

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

@@ -64,8 +64,7 @@
 
 /obj/item/energy_net/dropped()
 	..()
-	spawn(10)
-		if(src) qdel(src)
+	QDEL_IN(src, 1 SECOND)
 
 /obj/item/energy_net/throw_impact(atom/hit_atom)
 	..()
@@ -85,8 +84,7 @@
 		qdel(src)
 
 	// If we miss or hit an obstacle, we still want to delete the net.
-	spawn(10)
-		if(src) qdel(src)
+	QDEL_IN(src, 1 SECOND)
 
 /obj/effect/energy_net
 	name = "energy net"

code/game/world_topic_commands.dm

@@ -356,6 +356,5 @@
 	uid = "topic_command_prometheus_metrics"
 
 /decl/topic_command/secure/prometheus_metrics/use()
-	if(!global.prometheus_metrics)
-		return "Metrics not ready"
-	return global.prometheus_metrics.collect()
+	var/static/decl/prometheus_metrics/prometheus_metrics = IMPLIED_DECL
+	return prometheus_metrics.collect()

code/modules/admin/secrets/investigation/attack_logs.dm

@@ -69,66 +69,65 @@
 	. = filters_per_client[user.client]
 	if(!.)
 		. = list()
-		for(var/af_type in subtypesof(/attack_filter))
-			var/attack_filter/af = af_type
-			if(initial(af.category) == af_type)
+		for(var/datum/attack_filter/af_type as anything in subtypesof(/datum/attack_filter))
+			if(TYPE_IS_ABSTRACT(af_type))
 				continue
 			. += new af_type(src)
 		filters_per_client[user.client] = .
 
 /datum/admin_secret_item/investigation/attack_logs/proc/get_filter_html(user)
 	. = list()
 	for(var/filter in get_user_filters(user))
-		var/attack_filter/af = filter
+		var/datum/attack_filter/af = filter
 		. += af.get_html()
 	. = jointext(.," | ")
 
 /datum/admin_secret_item/investigation/attack_logs/proc/filter_log(user, var/datum/attack_log/al)
 	for(var/filter in get_user_filters(user))
-		var/attack_filter/af = filter
+		var/datum/attack_filter/af = filter
 		if(af.filter_attack(al))
 			return TRUE
 	return FALSE
 
 /datum/admin_secret_item/investigation/attack_logs/proc/reset_user_filters(user)
 	for(var/filter in get_user_filters(user))
-		var/attack_filter/af = filter
+		var/datum/attack_filter/af = filter
 		af.reset()
 
-/attack_filter
-	var/category = /attack_filter
+/datum/attack_filter
+	abstract_type = /datum/attack_filter
 	var/datum/admin_secret_item/investigation/attack_logs/holder
 
-/attack_filter/New(var/holder)
+/datum/attack_filter/New(var/holder)
 	..()
 	src.holder = holder
 
-/attack_filter/Topic(href, href_list)
+/datum/attack_filter/Topic(href, href_list)
 	if(..())
 		return TRUE
 	if(OnTopic(href_list))
 		holder.execute(usr)
 		return TRUE
 
-/attack_filter/proc/get_html()
+/datum/attack_filter/proc/get_html()
 	return
 
-/attack_filter/proc/reset()
+/datum/attack_filter/proc/reset()
 	return
 
-/attack_filter/proc/filter_attack(var/datum/attack_log/al)
+/datum/attack_filter/proc/filter_attack(var/datum/attack_log/al)
 	return FALSE
 
-/attack_filter/proc/OnTopic(href_list)
+/datum/attack_filter/proc/OnTopic(href_list)
 	return FALSE
 
 /*
 * Filter logs with one or more missing clients
 */
-/attack_filter/no_client
+/datum/attack_filter/no_client
 	var/filter_missing_clients = TRUE
 
-/attack_filter/no_client/get_html()
+/datum/attack_filter/no_client/get_html()
 	. = list()
 	. += "Must have clients: "
 	if(filter_missing_clients)
@@ -137,18 +136,18 @@
 		. += "<a href='byond://?src=\ref[src];yes=1'>Yes</a><span class='linkOn'>No</span>"
 	. = jointext(.,null)
 
-/attack_filter/no_client/OnTopic(href_list)
+/datum/attack_filter/no_client/OnTopic(href_list)
 	if(href_list["yes"] && !filter_missing_clients)
 		filter_missing_clients = TRUE
 		return TRUE
 	if(href_list["no"] && filter_missing_clients)
 		filter_missing_clients = FALSE
 		return TRUE
 
-/attack_filter/no_client/reset()
+/datum/attack_filter/no_client/reset()
 	filter_missing_clients = initial(filter_missing_clients)
 
-/attack_filter/no_client/filter_attack(var/datum/attack_log/al)
+/datum/attack_filter/no_client/filter_attack(var/datum/attack_log/al)
 	if(!filter_missing_clients)
 		return FALSE
 	if(al.attacker && al.attacker.client.ckey == NO_CLIENT_CKEY)
@@ -160,19 +159,19 @@
 /*
 	Either subject must be the selected client
 */
-/attack_filter/must_be_given_ckey
+/datum/attack_filter/must_be_given_ckey
 	var/ckey_filter
 	var/check_attacker = TRUE
 	var/check_victim = TRUE
 	var/description = "Either ckey is"
 
-/attack_filter/must_be_given_ckey/reset()
+/datum/attack_filter/must_be_given_ckey/reset()
 	ckey_filter = null
 
-/attack_filter/must_be_given_ckey/get_html()
+/datum/attack_filter/must_be_given_ckey/get_html()
 	return "[description]: <a href='byond://?src=\ref[src];select_ckey=1'>[ckey_filter ? ckey_filter : "*ANY*"]</a>"
 
-/attack_filter/must_be_given_ckey/OnTopic(href_list)
+/datum/attack_filter/must_be_given_ckey/OnTopic(href_list)
 	if(!href_list["select_ckey"])
 		return
 	var/ckey = input("Select ckey to filter on","Select ckey", ckey_filter) as null|anything in get_ckeys()
@@ -183,7 +182,7 @@
 			ckey_filter = ckey
 		return TRUE
 
-/attack_filter/must_be_given_ckey/proc/get_ckeys()
+/datum/attack_filter/must_be_given_ckey/proc/get_ckeys()
 	. = list()
 	for(var/log in attack_log_repository.attack_logs_)
 		var/datum/attack_log/al = log
@@ -194,7 +193,7 @@
 	. = sortTim(., /proc/cmp_text_asc)
 	. += "*ANY*"
 
-/attack_filter/must_be_given_ckey/filter_attack(var/datum/attack_log/al)
+/datum/attack_filter/must_be_given_ckey/filter_attack(var/datum/attack_log/al)
 	if(!ckey_filter)
 		return FALSE
 	if(check_attacker && al.attacker && al.attacker.client.ckey == ckey_filter)
@@ -206,19 +205,19 @@
 /*
 	Attacker must be the selected client
 */
-/attack_filter/must_be_given_ckey/attacker
+/datum/attack_filter/must_be_given_ckey/attacker
 	description = "Attacker ckey is"
 	check_victim = FALSE
 
-/attack_filter/must_be_given_ckey/attacker/filter_attack(al)
+/datum/attack_filter/must_be_given_ckey/attacker/filter_attack(al)
 	return ..(al, TRUE, FALSE)
 
 /*
 	Victim must be the selected client
 */
-/attack_filter/must_be_given_ckey/victim
+/datum/attack_filter/must_be_given_ckey/victim
 	description = "Victim ckey is"
 	check_attacker = FALSE
 
-/attack_filter/must_be_given_ckey/victim/filter_attack(al)
+/datum/attack_filter/must_be_given_ckey/victim/filter_attack(al)
 	return ..(al, FALSE, TRUE)