Merge branch 'master' into donoritemmodularization

code/game/gamemodes/antag_spawner.dm

@@ -127,7 +127,7 @@
 			return
 		used = TRUE
 		var/mob/dead/observer/theghost = pick(nuke_candidates)
-		spawn_antag(theghost.client, get_turf(src), "syndieborg")
+		spawn_antag(theghost.client, get_turf(src), "syndieborg", user)
 		do_sparks(4, TRUE, src)
 		qdel(src)
 	else

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -56,13 +56,6 @@
 		return 1
 	return ..()
 
-/mob/living/simple_animal/hostile/blob/handle_inherent_channels(message, message_mode)
-	if(message_mode == MODE_BINARY)
-		blob_chat(message)
-		return 1
-	else
-		..()
-
 /mob/living/simple_animal/hostile/blob/proc/blob_chat(msg)
 	var/spanned_message = say_quote(msg, get_spans())
 	var/rendered = "<font color=\"#EE4000\"><b>\[Blob Telepathy\] [real_name]</b> [spanned_message]</font>"
@@ -100,7 +93,7 @@
 	var/death_cloud_size = 1 //size of cloud produced from a dying spore
 	var/mob/living/carbon/human/oldguy
 	var/is_zombie = 0
-	gold_core_spawnable = 1
+	gold_core_spawnable = HOSTILE_SPAWN
 
 /mob/living/simple_animal/hostile/blob/blobspore/Initialize(mapload, var/obj/structure/blob/factory/linked_node)
 	if(istype(linked_node))
@@ -299,4 +292,4 @@
 
 /mob/living/simple_animal/hostile/blob/blobbernaut/independent
 	independent = TRUE
-	gold_core_spawnable = 1
+	gold_core_spawnable = HOSTILE_SPAWN

code/game/gamemodes/blob/blobs/core.dm

@@ -19,7 +19,7 @@
 	GLOB.poi_list |= src
 	update_icon() //so it atleast appears
 	if(!placed && !overmind)
-		qdel(src)
+		return INITIALIZE_HINT_QDEL
 	if(overmind)
 		update_icon()
 	point_rate = new_rate

code/game/gamemodes/brother/traitor_bro.dm

@@ -114,19 +114,19 @@
 		for(var/datum/objective/objective in team.objectives)
 			if(objective.check_completion())
 				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-				SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
+				SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "SUCCESS"))
 			else
 				text += "<br><B>Objective #[objective_count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-				SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
+				SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "FAIL"))
 				if(!(istype(objective, /datum/objective/crew)))
 					win = FALSE
 			objective_count++
 		if(win)
 			text += "<br><font color='green'><B>The blood brothers were successful!</B></font>"
-			SSblackbox.add_details("brother_success","SUCCESS")
+			SSblackbox.record_feedback("tally", "brother_success", 1, "SUCCESS")
 		else
 			text += "<br><font color='red'><B>The blood brothers have failed!</B></font>"
-			SSblackbox.add_details("brother_success","FAIL")
+			SSblackbox.record_feedback("tally", "brother_success", 1, "FAIL")
 		text += "<br>"
 	to_chat(world, text)
 

code/game/gamemodes/changeling/changeling.dm

@@ -115,20 +115,20 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 				for(var/datum/objective/objective in changeling.objectives)
 					if(objective.check_completion())
 						text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <font color='green'><b>Success!</b></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-						SSblackbox.add_details("changeling_objective","[objective.type]|SUCCESS")
+						SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "SUCCESS"))
 					else
 						text += "<br><b>Objective #[count]</b>: [objective.explanation_text] <span class='danger'>Fail.</span> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-						SSblackbox.add_details("changeling_objective","[objective.type]|FAIL")
+						SSblackbox.record_feedback("nested tally", "changeling_objective", 1, list("[objective.type]", "FAIL"))
 						if(!(istype(objective, /datum/objective/crew)))
 							changelingwin = 0
 					count++
 
 			if(changelingwin)
 				text += "<br><font color='green'><b>The changeling was successful!</b></font>"
-				SSblackbox.add_details("changeling_success","SUCCESS")
+				SSblackbox.record_feedback("tally", "changeling_success", 1, "SUCCESS")
 			else
 				text += "<br><span class='boldannounce'>The changeling has failed.</span>"
-				SSblackbox.add_details("changeling_success","FAIL")
+				SSblackbox.record_feedback("tally", "changeling_success", 1, "FAIL")
 			text += "<br>"
 
 		to_chat(world, text)
@@ -174,4 +174,4 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 		if(equip)
 			user.equip_to_slot_or_del(C, GLOB.slot2slot[slot])
 
-	user.regenerate_icons()
+	user.regenerate_icons()

code/game/gamemodes/changeling/changeling_power.dm

@@ -19,7 +19,7 @@
 
 /obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec)
 	if(!is_respec)
-		SSblackbox.add_details("changeling_power_purchase",name)
+		SSblackbox.record_feedback("tally", "changeling_power_purchase", 1, name)
 
 /obj/effect/proc_holder/changeling/proc/on_refund(mob/user)
 	return
@@ -35,7 +35,7 @@
 		return
 	var/datum/antagonist/changeling/c = user.mind.has_antag_datum(/datum/antagonist/changeling)
 	if(sting_action(user, target))
-		SSblackbox.add_details("changeling_powers",name)
+		SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]"))
 		sting_feedback(user, target)
 		c.chem_charges -= chemical_cost
 

code/game/gamemodes/changeling/powers/absorb.dm

@@ -41,13 +41,13 @@
 				to_chat(target, "<span class='userdanger'>You feel a sharp stabbing pain!</span>")
 				target.take_overall_damage(40)
 
-		SSblackbox.add_details("changeling_powers","Absorb DNA|[i]")
+		SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("Absorb DNA", "[i]"))
 		if(!do_mob(user, target, 150))
 			to_chat(user, "<span class='warning'>Our absorption of [target] has been interrupted!</span>")
 			changeling.isabsorbing = 0
 			return
 
-	SSblackbox.add_details("changeling_powers","Absorb DNA|4")
+	SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("Absorb DNA", "4"))
 	user.visible_message("<span class='danger'>[user] sucks the fluids from [target]!</span>", "<span class='notice'>We have absorbed [target].</span>")
 	to_chat(target, "<span class='userdanger'>You are absorbed by the changeling!</span>")
 

code/game/gamemodes/changeling/powers/linglink.dm

@@ -50,14 +50,14 @@
 				to_chat(target, "<span class='userdanger'>A migraine throbs behind your eyes, you hear yourself screaming - but your mouth has not opened!</span>")
 				for(var/mi in GLOB.mob_list)
 					var/mob/M = mi
-					if(M.lingcheck() == 2)
+					if(M.lingcheck() == LINGHIVE_LING)
 						to_chat(M, "<i><font color=#800080>We can sense a foreign presence in the hivemind...</font></i>")
 				target.mind.linglink = 1
 				target.say(":g AAAAARRRRGGGGGHHHHH!!")
 				to_chat(target, "<font color=#800040><span class='boldannounce'>You can now communicate in the changeling hivemind, say \":g message\" to communicate!</span>")
 				target.reagents.add_reagent("salbutamol", 40) // So they don't choke to death while you interrogate them
 				sleep(1800)
-		SSblackbox.add_details("changeling_powers","Hivemind Link|[i]")
+		SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]", "[i]"))
 		if(!do_mob(user, target, 20))
 			to_chat(user, "<span class='warning'>Our link with [target] has ended!</span>")
 			changeling.islinking = 0

code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm

@@ -10,6 +10,13 @@
 	light_power = 3
 	light_color = "#6A4D2F"
 
+
+/obj/effect/clockwork/city_of_cogs_rift/singularity_act()
+	return
+
+/obj/effect/clockwork/city_of_cogs_rift/singularity_pull()
+	return
+
 /obj/effect/clockwork/city_of_cogs_rift/Initialize()
 	. = ..()
 	visible_message("<span class='warning'>The air above [loc] shimmers and pops as a [name] forms there!</span>")

code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm

@@ -10,6 +10,11 @@
 /obj/effect/clockwork/overlay/ex_act()
 	return FALSE
 
+/obj/effect/clockwork/overlay/singularity_act()
+	return
+/obj/effect/clockwork/overlay/singularity_pull()
+	return
+
 /obj/effect/clockwork/overlay/singularity_pull(S, current_size)
 	return
 

code/game/gamemodes/clock_cult/clock_effects/general_markers.dm

@@ -11,6 +11,12 @@
 	animate(src, alpha = 0, time = 10)
 	QDEL_IN(src, 10)
 
+/obj/effect/clockwork/general_marker/singularity_act()
+	return
+
+/obj/effect/clockwork/general_marker/singularity_pull()
+	return
+
 /obj/effect/clockwork/general_marker/inathneq
 	name = "Inath-neq, the Resonant Cogwheel"
 	desc = "A humanoid form blazing with blue fire. It radiates an aura of kindness and caring."

code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm

@@ -18,3 +18,9 @@
 			to_chat(L, "<span class='danger'>The space beyond here can't be accessed by you or other servants.</span>")
 			return
 	return TRUE
+
+/obj/effect/clockwork/servant_blocker/singularity_act()
+	return
+
+/obj/effect/clockwork/servant_blocker/singularity_pull()
+	return

code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm

@@ -109,6 +109,14 @@
 		return TRUE
 	return FALSE
 
+
+/obj/effect/clockwork/spatial_gateway/singularity_act()
+	return
+
+/obj/effect/clockwork/spatial_gateway/singularity_pull()
+	return
+
+
 /obj/effect/clockwork/spatial_gateway/CollidedWith(atom/movable/AM)
 	..()
 	if(!QDELETED(AM))

code/game/gamemodes/clock_cult/clock_items/judicial_visor.dm

@@ -162,6 +162,12 @@
 	user = caster
 	INVOKE_ASYNC(src, .proc/judicialblast)
 
+/obj/effect/clockwork/judicial_marker/singularity_act()
+	return
+
+/obj/effect/clockwork/judicial_marker/singularity_pull()
+	return
+
 /obj/effect/clockwork/judicial_marker/proc/judicialblast()
 	playsound(src, 'sound/magic/magic_missile.ogg', 50, 1, 1, 1)
 	flick("judicial_marker", src)

code/game/gamemodes/clock_cult/clock_scripture.dm

@@ -66,7 +66,7 @@ Applications: 8 servants, 3 caches, and 100 CV
 		else
 			successful = TRUE
 			if(slab && !slab.no_cost && !GLOB.ratvar_awakens) //if the slab exists and isn't debug and ratvar isn't up, log the scripture as being used
-				SSblackbox.add_details("clockcult_scripture_recited", name)
+				SSblackbox.record_feedback("tally", "clockcult_scripture_recited", 1, name)
 	if(slab)
 		slab.busy = null
 	post_recital()

code/game/gamemodes/cult/cult.dm

@@ -237,27 +237,27 @@
 				if("survive")
 					if(!check_survive())
 						explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. ([acolytes_survived] escaped) <span class='greenannounce'>Success!</span>"
-						SSblackbox.add_details("cult_objective","cult_survive|SUCCESS|[acolytes_needed]")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_survive", "SUCCESS"))
 						SSticker.news_report = CULT_ESCAPE
 					else
 						explanation = "Make sure at least [acolytes_needed] acolytes escape on the shuttle. ([acolytes_survived] escaped) <span class='boldannounce'>Fail.</span>"
-						SSblackbox.add_details("cult_objective","cult_survive|FAIL|[acolytes_needed]")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_survive", "FAIL"))
 						SSticker.news_report = CULT_FAILURE
 				if("sacrifice")
 					if(GLOB.sac_complete)
 						explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='greenannounce'>Success!</span>"
-						SSblackbox.add_details("cult_objective","cult_sacrifice|SUCCESS")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "SUCCESS"))
 					else
 						explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='boldannounce'>Fail.</span>"
-						SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "FAIL"))
 				if("eldergod")
 					if(!eldergod)
 						explanation = "Summon Nar-Sie. The summoning can only be accomplished in [english_list(GLOB.summon_spots)].<span class='greenannounce'>Success!</span>"
-						SSblackbox.add_details("cult_objective","cult_narsie|SUCCESS")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "SUCCESS"))
 						SSticker.news_report = CULT_SUMMON
 					else
 						explanation = "Summon Nar-Sie. The summoning can only be accomplished in [english_list(GLOB.summon_spots)]<span class='boldannounce'>Fail.</span>"
-						SSblackbox.add_details("cult_objective","cult_narsie|FAIL")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "FAIL"))
 						SSticker.news_report = CULT_FAILURE
 
 			text += "<br><B>Objective #[obj_count]</B>: [explanation]"
@@ -297,18 +297,18 @@
 					if(GLOB.sac_mind)
 						if(GLOB.sac_complete)
 							explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='greenannounce'>Success!</span>"
-							SSblackbox.add_details("cult_objective","cult_sacrifice|SUCCESS")
+							SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "SUCCESS"))
 						else
 							explanation = "Sacrifice [GLOB.sac_mind], the [GLOB.sac_mind.assigned_role]. <span class='boldannounce'>Fail.</span>"
-							SSblackbox.add_details("cult_objective","cult_sacrifice|FAIL")
+							SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_sacrifice", "FAIL"))
 				if("eldergod")
 					if(!eldergod)
 						explanation = "Summon Nar-Sie. <span class='greenannounce'>Success!</span>"
-						SSblackbox.add_details("cult_objective","cult_narsie|SUCCESS")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "SUCCESS"))
 						SSticker.news_report = CULT_SUMMON
 					else
 						explanation = "Summon Nar-Sie. <span class='boldannounce'>Fail.</span>"
-						SSblackbox.add_details("cult_objective","cult_narsie|FAIL")
+						SSblackbox.record_feedback("nested tally", "cult_objective", 1, list("cult_narsie", "FAIL"))
 						SSticker.news_report = CULT_FAILURE
 			text += "<br><B>Objective #[obj_count]</B>: [explanation]"
 	to_chat(world, text)

code/game/gamemodes/cult/cult_structures.dm

@@ -240,3 +240,9 @@
 	icon_state = "hole"
 	density = TRUE
 	anchored = TRUE
+
+/obj/effect/gateway/singularity_act()
+	return
+
+/obj/effect/gateway/singularity_pull()
+	return

code/game/gamemodes/cult/ritual.dm

@@ -246,7 +246,7 @@ This file contains the arcane tome files.
 	var/obj/effect/rune/R = new rune_to_scribe(Turf, chosen_keyword)
 	R.add_mob_blood(user)
 	to_chat(user, "<span class='cult'>The [lowertext(R.cultist_name)] rune [R.cultist_desc]</span>")
-	SSblackbox.add_details("cult_runes_scribed", R.cultist_name)
+	SSblackbox.record_feedback("tally", "cult_runes_scribed", 1, R.cultist_name)
 
 /obj/item/tome/proc/check_rune_turf(turf/T, mob/user)
 	if(isspaceturf(T))

code/game/gamemodes/devil/game_mode.dm

@@ -23,7 +23,7 @@
 		for(var/D in devils)
 			var/datum/mind/devil = D
 			text += printplayer(devil)
-			text += printdevilinfo(devil)
+			text += printdevilinfo(devil.current)
 			text += printobjectives(devil)
 			text += "<br>"
 		text += "<br>"

code/game/gamemodes/game_mode.dm

@@ -266,18 +266,19 @@
 			if(isobserver(M))
 				ghosts++
 
-	if(clients > 0)
-		SSblackbox.set_val("round_end_clients",clients)
-	if(ghosts > 0)
-		SSblackbox.set_val("round_end_ghosts",ghosts)
-	if(surviving_humans > 0)
-		SSblackbox.set_val("survived_human",surviving_humans)
-	if(surviving_total > 0)
-		SSblackbox.set_val("survived_total",surviving_total)
-	if(escaped_humans > 0)
-		SSblackbox.set_val("escaped_human",escaped_humans)
-	if(escaped_total > 0)
-		SSblackbox.set_val("escaped_total",escaped_total)
+	if(clients)
+		SSblackbox.record_feedback("nested tally", "round_end_stats", clients, list("clients"))
+	if(ghosts)
+		SSblackbox.record_feedback("nested tally", "round_end_stats", ghosts, list("ghosts"))
+	if(surviving_humans)
+		SSblackbox.record_feedback("nested tally", "round_end_stats", surviving_humans, list("survivors", "human"))
+	if(surviving_total)
+		SSblackbox.record_feedback("nested tally", "round_end_stats", surviving_total, list("survivors", "total"))
+	if(escaped_humans)
+		SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_humans, list("escapees", "human"))
+	if(escaped_total)
+		SSblackbox.record_feedback("nested tally", "round_end_stats", escaped_total, list("escapees", "total"))
+
 	send2irc("Server", "Round just ended.")
 	if(cult.len && !istype(SSticker.mode, /datum/game_mode/cult))
 		datum_cult_completion()

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -734,6 +734,33 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	owner.playsound_local(owner, "sparks", 50, 0)
 
 
+//Disable Emergency Lights
+/datum/AI_Module/small/emergency_lights
+	module_name = "Disable Emergency Lights"
+	mod_pick_name = "disable_emergency_lights"
+	description = "Cuts emergency lights across the entire station. If power is lost to light fixtures, they will not attempt to fall back on emergency power reserves."
+	cost = 10
+	one_purchase = TRUE
+	power_type = /datum/action/innate/ai/emergency_lights
+	unlock_text = "<span class='notice'>You hook into the powernet and locate the connections between light fixtures and their fallbacks.</span>"
+	unlock_sound = "sparks"
+
+/datum/action/innate/ai/emergency_lights
+	name = "Disable Emergency Lights"
+	desc = "Disables all emergency lighting. Note that emergency lights can be restored through reboot at an APC."
+	button_icon_state = "emergency_lights"
+	uses = 1
+
+/datum/action/innate/ai/emergency_lights/Activate()
+	for(var/obj/machinery/light/L in GLOB.machines)
+		if(L.z in GLOB.station_z_levels)
+			L.no_emergency = TRUE
+			INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE)
+		CHECK_TICK
+	to_chat(owner, "<span class='notice'>Emergency light connections severed.</span>")
+	owner.playsound_local(owner, 'sound/effects/light_flicker.ogg', 50, FALSE)
+
+
 //Reactivate Camera Network: Reactivates up to 30 cameras across the station.
 /datum/AI_Module/small/reactivate_cameras
 	module_name = "Reactivate Camera Network"

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -101,8 +101,8 @@
 /mob/living/simple_animal/hostile/swarmer/Initialize()
 	. = ..()
 	verbs -= /mob/living/verb/pulled
-	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
-	diag_hud.add_to_hud(src)
+	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
+		diag_hud.add_to_hud(src)
 
 /mob/living/simple_animal/hostile/swarmer/med_hud_set_health()
 	var/image/holder = hud_list[DIAG_HUD]
@@ -121,13 +121,6 @@
 	if(statpanel("Status"))
 		stat("Resources:",resources)
 
-/mob/living/simple_animal/hostile/swarmer/handle_inherent_channels(message, message_mode)
-	if(message_mode == MODE_BINARY)
-		swarmer_chat(message)
-		return ITALICS | REDUCE_RANGE
-	else
-		. = ..()
-
 /mob/living/simple_animal/hostile/swarmer/get_spans()
 	return ..() | SPAN_ROBOT
 

code/game/gamemodes/miniantags/slaughter/slaughterevent.dm

@@ -32,7 +32,7 @@
 		return MAP_ERROR
 
 	var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs)))
-	var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
+	var/mob/living/simple_animal/slaughter/S = new (holder)
 	S.holder = holder
 	player_mind.transfer_to(S)
 	player_mind.assigned_role = "Slaughter Demon"

code/game/gamemodes/nuclear/nuclear.dm

@@ -264,10 +264,11 @@
 		var/TC_uses = 0
 		for(var/datum/mind/syndicate in syndicates)
 			text += printplayer(syndicate)
-			for(var/obj/item/device/uplink/H in GLOB.uplinks)
-				if(H && H.owner && H.owner == syndicate.key)
-					TC_uses += H.spent_telecrystals
-					purchases += H.purchase_log
+			for(var/datum/component/uplink/H in GLOB.uplinks)
+				if(H.purchase_log)
+					purchases += H.purchase_log.generate_render()
+				else
+					stack_trace("WARNING: Uplink with no purchase_log in nuclear mode! Owner: [H.owner]")
 		text += "<br>"
 		text += "(Syndicates used [TC_uses] TC) [purchases]"
 		if(TC_uses == 0 && station_was_nuked && !are_operatives_dead())
@@ -325,9 +326,7 @@
 	R.freqlock = 1
 
 	if(tc)
-		var/obj/item/device/radio/uplink/nuclear/U = new(H)
-		U.hidden_uplink.owner = "[H.key]"
-		U.hidden_uplink.telecrystals = tc
+		var/obj/item/device/radio/uplink/nuclear/U = new(H, H.key, tc)
 		H.equip_to_slot_or_del(U, slot_in_backpack)
 
 	var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H)

code/game/gamemodes/nuclear/nuclear_challenge.dm

@@ -54,33 +54,31 @@
 		var/obj/item/circuitboard/computer/syndicate_shuttle/board = V
 		board.challenge = TRUE
 
-	var/obj/item/device/radio/uplink/nuclear/U = new(get_turf(user))
-	U.hidden_uplink.owner = "[user.key]"
-	U.hidden_uplink.telecrystals = CHALLENGE_TELECRYSTALS
-	U.hidden_uplink.set_gamemode(/datum/game_mode/nuclear)
+	new /obj/item/device/radio/uplink/nuclear(get_turf(user), user.key, CHALLENGE_TELECRYSTALS)
 	CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
-	SSblackbox.set_val("nuclear_challenge_mode",1)
+	SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)
+
 	qdel(src)
 
 /obj/item/device/nuclear_challenge/proc/check_allowed(mob/living/user)
 	if(declaring_war)
 		to_chat(user, "You are already in the process of declaring war! Make your mind up.")
-		return 0
+		return FALSE
 	if(GLOB.player_list.len < CHALLENGE_MIN_PLAYERS)
 		to_chat(user, "The enemy crew is too small to be worth declaring war on.")
-		return 0
+		return FALSE
 	if(user.z != ZLEVEL_CENTCOM)
 		to_chat(user, "You have to be at your base to use this.")
-		return 0
+		return FALSE
 	if(world.time-SSticker.round_start_time > CHALLENGE_TIME_LIMIT)
 		to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.")
-		return 0
+		return FALSE
 	for(var/V in GLOB.syndicate_shuttle_boards)
 		var/obj/item/circuitboard/computer/syndicate_shuttle/board = V
 		if(board.moved)
 			to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.")
-			return 0
-	return 1
+			return FALSE
+	return TRUE
 
 #undef CHALLENGE_TELECRYSTALS
 #undef CHALLENGE_MIN_PLAYERS

code/game/gamemodes/sandbox/h_sandbox.dm

@@ -28,7 +28,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
 	var/global/list/spawn_forbidden = list(
 		/obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you
 		/obj/item/assembly, /obj/item/device/onetankbomb, /obj/item/radio, /obj/item/device/pda/ai,
-		/obj/item/device/uplink, /obj/item/smallDelivery, /obj/item/projectile,
+		/obj/item/smallDelivery, /obj/item/projectile,
 		/obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module)
 
 /datum/hSB/proc/update()

code/game/gamemodes/traitor/traitor.dm

@@ -103,11 +103,11 @@
 			var/TC_uses = 0
 			var/uplink_true = FALSE
 			var/purchases = ""
-			for(var/obj/item/device/uplink/H in GLOB.uplinks)
+			for(var/datum/component/uplink/H in GLOB.uplinks)
 				if(H && H.owner && H.owner == traitor.key)
 					TC_uses += H.spent_telecrystals
 					uplink_true = TRUE
-					purchases += H.purchase_log
+					purchases += H.purchase_log.generate_render(FALSE)
 
 			var/objectives = ""
 			if(traitor.objectives.len)//If the traitor had no objectives, don't need to process this.
@@ -115,10 +115,10 @@
 				for(var/datum/objective/objective in traitor.objectives)
 					if(objective.check_completion())
 						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-						SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
+						SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "SUCCESS"))
 					else
 						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-						SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
+						SSblackbox.record_feedback("nested tally", "traitor_objective", 1, list("[objective.type]", "FAIL"))
 						if(!(istype(objective, /datum/objective/crew)))
 							traitorwin = FALSE
 					count++
@@ -140,10 +140,10 @@
 
 			if(traitorwin)
 				text += "<br><font color='green'><B>The [special_role_text] was successful!</B></font>"
-				SSblackbox.add_details("traitor_success","SUCCESS")
+				SSblackbox.record_feedback("tally", "traitor_success", 1, "SUCCESS")
 			else
 				text += "<br><font color='red'><B>The [special_role_text] has failed!</B></font>"
-				SSblackbox.add_details("traitor_success","FAIL")
+				SSblackbox.record_feedback("tally", "traitor_success", 1, "FAIL")
 				SEND_SOUND(traitor.current, 'sound/ambience/ambifailure.ogg')
 
 			text += "<br>"

code/game/gamemodes/wizard/artefact.dm

@@ -33,7 +33,7 @@
 /obj/effect/rend
 	name = "tear in the fabric of reality"
 	desc = "You should run now."
-	icon = 'icons/obj/biomass.dmi'
+	icon = 'icons/effects/effects.dmi'
 	icon_state = "rift"
 	density = TRUE
 	anchored = TRUE
@@ -66,6 +66,12 @@
 	else
 		return ..()
 
+/obj/effect/rend/singularity_pull()
+	return
+
+/obj/effect/rend/singularity_pull()
+	return
+
 /obj/item/veilrender/vealrender
 	name = "veal render"
 	desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm."
@@ -300,6 +306,11 @@
 		var/area/A = get_area(src)
 		to_chat(victim, "<span class='notice'>You feel a dark presence from [A.name]</span>")
 
+/obj/item/voodoo/suicide_act(mob/living/carbon/user)
+    user.visible_message("<span class='suicide'>[user] links the voodoo doll to themself and sits on it, infinitely crushing themself! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+    user.gib()
+    return(BRUTELOSS)
+
 /obj/item/voodoo/fire_act(exposed_temperature, exposed_volume)
 	if(target)
 		target.adjust_fire_stacks(20)
@@ -307,7 +318,6 @@
 		GiveHint(target,1)
 	return ..()
 
-
 //Provides a decent heal, need to pump every 6 seconds
 /obj/item/organ/heart/cursed/wizard
 	pump_delay = 60

code/game/gamemodes/wizard/spellbook.dm

@@ -57,10 +57,10 @@
 						aspell.name = "Instant [aspell.name]"
 				if(aspell.spell_level >= aspell.level_max)
 					to_chat(user, "<span class='notice'>This spell cannot be strengthened any further.</span>")
-				SSblackbox.add_details("wizard_spell_improved", "[name]|[aspell.level]")
+				SSblackbox.record_feedback("nested tally", "wizard_spell_improved", 1, list("[name]", "[aspell.level]"))
 				return 1
 	//No same spell found - just learn it
-	SSblackbox.add_details("wizard_spell_learned", name)
+	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	user.mind.AddSpell(S)
 	to_chat(user, "<span class='notice'>You have learned [S.name].</span>")
 	return 1
@@ -265,7 +265,7 @@
 
 /datum/spellbook_entry/item/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
 	new item_path(get_turf(user))
-	SSblackbox.add_details("wizard_spell_learned", name)
+	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	return 1
 
 /datum/spellbook_entry/item/GetInfo()
@@ -464,7 +464,7 @@
 		return TRUE
 
 /datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
-	SSblackbox.add_details("wizard_spell_learned", name)
+	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	new /datum/round_event/wizard/ghost()
 	active = TRUE
 	to_chat(user, "<span class='notice'>You have cast summon ghosts!</span>")
@@ -481,7 +481,7 @@
 	return !CONFIG_GET(flag/no_summon_guns)
 
 /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
-	SSblackbox.add_details("wizard_spell_learned", name)
+	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	rightandwrong(0, user, 25)
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
@@ -498,7 +498,7 @@
 	return !CONFIG_GET(flag/no_summon_magic)
 
 /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
-	SSblackbox.add_details("wizard_spell_learned", name)
+	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	rightandwrong(1, user, 25)
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
@@ -516,7 +516,7 @@
 	return !CONFIG_GET(flag/no_summon_events)
 
 /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
-	SSblackbox.add_details("wizard_spell_learned", name)
+	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	summonevents()
 	times++
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
@@ -905,7 +905,7 @@
 	var/static/banned_spells = list(/obj/item/spellbook/oneuse/mimery_blockade, /obj/item/spellbook/oneuse/mimery_guns)
 	var/real_type = pick(subtypesof(/obj/item/spellbook/oneuse) - banned_spells)
 	new real_type(loc)
-	qdel(src)
+	return INITIALIZE_HINT_QDEL
 
 /obj/item/spellbook/oneuse/sacredflame
 	spell = /obj/effect/proc_holder/spell/targeted/sacred_flame

code/game/gamemodes/wizard/wizard.dm

@@ -91,20 +91,20 @@
 			for(var/datum/objective/objective in wizard.objectives)
 				if(objective.check_completion())
 					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-					SSblackbox.add_details("wizard_objective","[objective.type]|SUCCESS")
+					SSblackbox.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "SUCCESS"))
 				else
 					text += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> [istype(objective, /datum/objective/crew) ? "<font color='grey'>(Optional)</font>" : ""]"
-					SSblackbox.add_details("wizard_objective","[objective.type]|FAIL")
+					SSblackbox.record_feedback("nested tally", "wizard_objective", 1, list("[objective.type]", "FAIL"))
 					if(!(istype(objective, /datum/objective/crew)))
 						wizardwin = 0
 				count++
 
-			if(wizard.current && wizard.current.stat!=2 && wizardwin)
+			if(wizard.current && wizardwin)
 				text += "<br><font color='green'><B>The wizard was successful!</B></font>"
-				SSblackbox.add_details("wizard_success","SUCCESS")
+				SSblackbox.record_feedback("tally", "wizard_success", 1, "SUCCESS")
 			else
 				text += "<br><font color='red'><B>The wizard has failed!</B></font>"
-				SSblackbox.add_details("wizard_success","FAIL")
+				SSblackbox.record_feedback("tally", "wizard_success", 1, "FAIL")
 			if(wizard.spell_list.len>0)
 				text += "<br><B>[wizard.name] used the following spells: </B>"
 				var/i = 1