diff --git a/code/modules/research/nanites/nanite_hijacker.dm b/code/modules/research/nanites/nanite_hijacker.dm
deleted file mode 100644
index 8e5e68dd18..0000000000
--- a/code/modules/research/nanites/nanite_hijacker.dm
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Doesnt work anymore due to code updates, was unused anyways.
-/obj/item/nanite_hijacker
-	name = "nanite remote control" //fake name
-	desc = "A device that can load nanite programming disks, edit them at will, and imprint them to nanites remotely."
-	w_class = WEIGHT_CLASS_SMALL
-	icon = 'icons/obj/device.dmi'
-	icon_state = "nanite_remote"
-	item_flags = NOBLUDGEON
-	var/obj/item/disk/nanite_program/disk
-	var/datum/nanite_program/program
-
-/obj/item/nanite_hijacker/AltClick(mob/user)
-	. = ..()
-	if(!user.canUseTopic(src, BE_CLOSE))
-		return
-	if(disk)
-		eject()
-		return TRUE
-
-/obj/item/nanite_hijacker/examine(mob/user)
-	. = ..()
-	if(disk)
-		. += "<span class='notice'>Alt-click [src] to eject the disk.</span>"
-
-/obj/item/nanite_hijacker/attackby(obj/item/I, mob/user)
-	if(istype(I, /obj/item/disk/nanite_program))
-		var/obj/item/disk/nanite_program/N = I
-		if(disk)
-			eject()
-		if(user.transferItemToLoc(N, src))
-			to_chat(user, "<span class='notice'>You insert [N] into [src]</span>")
-			disk = N
-			program = N.program
-	else
-		..()
-
-/obj/item/nanite_hijacker/proc/eject(mob/living/user)
-	if(!disk)
-		return
-	if(!istype(user) || !Adjacent(user) || !user.put_in_hand(disk))
-		disk.forceMove(drop_location())
-	disk = null
-	program = null
-
-/obj/item/nanite_hijacker/afterattack(atom/target, mob/user, etc)
-	if(!disk || !disk.program)
-		return
-	if(isliving(target))
-		var/success = SEND_SIGNAL(target, COMSIG_NANITE_ADD_PROGRAM, program.copy())
-		switch(success)
-			if(NONE)
-				to_chat(user, "<span class='notice'>You don't detect any nanites in [target].</span>")
-			if(COMPONENT_PROGRAM_INSTALLED)
-				to_chat(user, "<span class='notice'>You insert the currently loaded program into [target]'s nanites.</span>")
-			if(COMPONENT_PROGRAM_NOT_INSTALLED)
-				to_chat(user, "<span class='warning'>You try to insert the currently loaded program into [target]'s nanites, but the installation fails.</span>")
-
-//Same UI as the nanite programmer, as it pretty much does the same
-/obj/item/nanite_hijacker/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
-	SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "nanite_programmer", "Internal Nanite Programmer", 420, 800, master_ui, state)
-		ui.open()
-
-/obj/item/nanite_hijacker/ui_data()
-	var/list/data = list()
-	data["has_disk"] = istype(disk)
-	data["has_program"] = istype(program)
-	if(program)
-		data["name"] = program.name
-		data["desc"] = program.desc
-		data["use_rate"] = program.use_rate
-		data["can_trigger"] = program.can_trigger
-		data["trigger_cost"] = program.trigger_cost
-		data["trigger_cooldown"] = program.trigger_cooldown / 10
-
-		data["activated"] = program.activated
-		data["activation_delay"] = program.activation_delay
-		data["timer"] = program.timer
-		data["activation_code"] = program.activation_code
-		data["deactivation_code"] = program.deactivation_code
-		data["kill_code"] = program.kill_code
-		data["trigger_code"] = program.trigger_code
-		data["timer_type"] = program.get_timer_type_text()
-
-		var/list/extra_settings = list()
-		for(var/X in program.extra_settings)
-			var/list/setting = list()
-			setting["name"] = X
-			setting["value"] = program.get_extra_setting(X)
-			extra_settings += list(setting)
-		data["extra_settings"] = extra_settings
-		if(LAZYLEN(extra_settings))
-			data["has_extra_settings"] = TRUE
-
-	return data
-
-/obj/item/nanite_hijacker/ui_act(action, params)
-	if(..())
-		return
-	switch(action)
-		if("eject")
-			eject(usr)
-			. = TRUE
-		if("toggle_active")
-			program.activated = !program.activated //we don't use the activation procs since we aren't in a mob
-			if(program.activated)
-				program.activation_delay = 0
-			. = TRUE
-		if("set_code")
-			var/new_code = input("Set code (0000-9999):", name, null) as null|num
-			if(!isnull(new_code))
-				new_code = CLAMP(round(new_code, 1),0,9999)
-			else
-				return
-
-			var/target_code = params["target_code"]
-			switch(target_code)
-				if("activation")
-					program.activation_code = CLAMP(round(new_code, 1),0,9999)
-				if("deactivation")
-					program.deactivation_code = CLAMP(round(new_code, 1),0,9999)
-				if("kill")
-					program.kill_code = CLAMP(round(new_code, 1),0,9999)
-				if("trigger")
-					program.trigger_code = CLAMP(round(new_code, 1),0,9999)
-			. = TRUE
-		if("set_extra_setting")
-			program.set_extra_setting(usr, params["target_setting"])
-			. = TRUE
-		if("set_activation_delay")
-			var/delay = input("Set activation delay in seconds (0-1800):", name, program.activation_delay) as null|num
-			if(!isnull(delay))
-				delay = CLAMP(round(delay, 1),0,1800)
-				program.activation_delay = delay
-				if(delay)
-					program.activated = FALSE
-			. = TRUE
-		if("set_timer")
-			var/timer = input("Set timer in seconds (10-3600):", name, program.timer) as null|num
-			if(!isnull(timer))
-				if(!timer == 0)
-					timer = CLAMP(round(timer, 1),10,3600)
-				program.timer = timer
-			. = TRUE
-		if("set_timer_type")
-			var/new_type = input("Choose the timer effect","Timer Effect") as null|anything in list("Deactivate","Self-Delete","Trigger","Reset Activation Timer")
-			if(new_type)
-				switch(new_type)
-					if("Deactivate")
-						program.timer_type = NANITE_TIMER_DEACTIVATE
-					if("Self-Delete")
-						program.timer_type = NANITE_TIMER_SELFDELETE
-					if("Trigger")
-						program.timer_type = NANITE_TIMER_TRIGGER
-					if("Reset Activation Timer")
-						program.timer_type = NANITE_TIMER_RESET
-			. = TRUE
-*/
diff --git a/code/modules/research/nanites/nanite_programmer.dm b/code/modules/research/nanites/nanite_programmer.dm
index e61f58c81e..d81880c6d9 100644
--- a/code/modules/research/nanites/nanite_programmer.dm
+++ b/code/modules/research/nanites/nanite_programmer.dm
@@ -131,7 +131,7 @@
 				program.timer_trigger_delay = timer
 			. = TRUE
 
-/obj/machinery/nanite_programmer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
+/obj/machinery/nanite_programmer/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source)
 	. = ..()
 	var/static/regex/when = regex("(?:^\\W*when|when\\W*$)", "i") //starts or ends with when
 	if(findtext(raw_message, when) && !istype(speaker, /obj/machinery/nanite_programmer))
diff --git a/code/modules/research/nanites/nanite_programs/buffing.dm b/code/modules/research/nanites/nanite_programs/buffing.dm
index ed3f420091..f52ae4843a 100644
--- a/code/modules/research/nanites/nanite_programs/buffing.dm
+++ b/code/modules/research/nanites/nanite_programs/buffing.dm
@@ -27,7 +27,7 @@
 	rogue_types = list(/datum/nanite_program/toxic, /datum/nanite_program/nerve_decay)
 
 /datum/nanite_program/adrenaline/on_trigger()
-	host_mob.do_adrenaline(-10, TRUE, TRUE, FALSE, TRUE, /datum/reagent/medicine/stimulants = 1.5, "<span class='notice'>You feel a sudden surge of energy!</span>", FALSE, FALSE, FALSE)
+	host_mob.do_adrenaline(-10, TRUE, TRUE, FALSE, TRUE, list(/datum/reagent/medicine/stimulants = 1.5), "<span class='notice'>You feel a sudden surge of energy!</span>", FALSE, FALSE, FALSE)
 
 /datum/nanite_program/hardening
 	name = "Dermal Hardening"