Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/game/objects/items/devices/geiger_counter.dm

@@ -192,13 +192,15 @@
 	update_icon()
 
 /obj/item/geiger_counter/emag_act(mob/user)
+	. = ..()
 	if(obj_flags & EMAGGED)
 		return
 	if(scanning)
 		to_chat(user, "<span class='warning'>Turn off [src] before you perform this action!</span>")
-		return 0
+		return
 	to_chat(user, "<span class='warning'>You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.</span>")
 	obj_flags |= EMAGGED
+	return TRUE
 
 /obj/item/geiger_counter/cyborg
 	var/datum/component/mobhook

code/game/objects/items/devices/lightreplacer.dm

@@ -149,9 +149,11 @@
 		to_chat(user, "<span class='notice'>You fill \the [src] with lights from \the [S]. " + status_string() + "</span>")
 
 /obj/item/lightreplacer/emag_act()
+	. = ..()
 	if(obj_flags & EMAGGED)
 		return
 	Emag()
+	return TRUE
 
 /obj/item/lightreplacer/attack_self(mob/user)
 	to_chat(user, status_string())

code/game/objects/items/devices/megaphone.dm

@@ -38,11 +38,13 @@
 			speech_args[SPEECH_SPANS] |= voicespan
 
 /obj/item/megaphone/emag_act(mob/user)
+	. = ..()
 	if(obj_flags & EMAGGED)
 		return
 	to_chat(user, "<span class='warning'>You overload \the [src]'s voice synthesizer.</span>")
 	obj_flags |= EMAGGED
 	voicespan = list(SPAN_REALLYBIG, "userdanger")
+	return TRUE
 
 /obj/item/megaphone/sec
 	name = "security megaphone"

code/game/objects/items/devices/multitool.dm

@@ -32,6 +32,24 @@
 	var/datum/integrated_io/selected_io = null  //functional for integrated circuits.
 	var/mode = 0
 
+/obj/item/multitool/chaplain
+	name = "\improper hypertool"
+	desc = "Used for pulsing wires to test which to cut. Also emits microwaves to fry some brains!"
+	damtype = BRAIN
+	force = 18
+	armour_penetration = 35
+	hitsound = 'sound/effects/sparks4.ogg'
+	var/chaplain_spawnable = TRUE
+	total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
+	throw_speed = 3
+	throw_range = 4
+	throwforce = 10
+	obj_flags = UNIQUE_RENAME
+
+/obj/item/multitool/chaplain/Initialize()
+	. = ..()
+	AddComponent(/datum/component/anti_magic, TRUE, TRUE)
+
 /obj/item/multitool/examine(mob/user)
 	..()
 	if(selected_io)