Emag refactor

code/modules/mob/living/carbon/human/human_defense.dm

@@ -198,7 +198,17 @@ emp_act
 			I.emp_act(severity)
 	..()
 
-
+/mob/living/carbon/human/emag_act(user as mob, var/datum/organ/external/affecting)
+	if(!(affecting.status & ORGAN_ROBOT))
+		user << "\red That limb isn't robotic."
+		return
+	if(affecting.sabotaged)
+		user << "\red [src]'s [affecting.display_name] is already sabotaged!"
+	else
+		user << "\red You sneakily slide the card into the dataport on [src]'s [affecting.display_name] and short out the safeties."
+		affecting.sabotaged = 1
+	return 1
+	
 //Returns 1 if the attack hit, 0 if it missed.
 /mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)
 	if(!I || !user)	return 0
@@ -236,17 +246,8 @@ emp_act
 		return 0
 
 	if(istype(I,/obj/item/weapon/card/emag))
-		if(!(affecting.status & ORGAN_ROBOT))
-			user << "\red That limb isn't robotic."
-			return
-		if(affecting.sabotaged)
-			user << "\red [src]'s [affecting.display_name] is already sabotaged!"
-		else
-			user << "\red You sneakily slide [I] into the dataport on [src]'s [affecting.display_name] and short out the safeties."
-			var/obj/item/weapon/card/emag/emag = I
-			emag.uses--
-			affecting.sabotaged = 1
-		return 1
+		emag_act(user, affecting)
+		
 	if(! I.discrete)
 		if(I.attack_verb.len)
 			visible_message("\red <B>[src] has been [pick(I.attack_verb)] in the [hit_area] with [I.name] by [user]!</B>")

code/modules/mob/living/silicon/mommi/mommi.dm

@@ -240,68 +240,6 @@ They can only use one tool at a time, they can't choose modules, and they have 1
 			else
 				user << "\red Access denied."
 
-	else if(istype(W, /obj/item/weapon/card/emag))		// trying to unlock with an emag card
-		if(!opened)//Cover is closed
-			if(locked)
-				if(prob(90))
-					user << "You emag the cover lock."
-					locked = 0
-				else
-					user << "You fail to emag the cover lock."
-					if(prob(25))
-						src << "Hack attempt detected."
-			else
-				user << "The cover is already unlocked."
-			return
-
-		if(opened)//Cover is open
-			if(emagged)	return//Prevents the X has hit Y with Z message also you cant emag them twice
-			if(wiresexposed)
-				user << "You must close the panel first"
-				return
-			else
-				sleep(6)
-				if(prob(50))
-					emagged = 1
-					lawupdate = 0
-					connected_ai = null
-					user << "You emag [src]'s interface."
-//					message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)].  Laws overridden.")
-					log_game("[key_name(user)] emagged cyborg [key_name(src)].  Laws overridden.")
-					clear_supplied_laws()
-					clear_inherent_laws()
-					laws = new /datum/ai_laws/syndicate_override
-					var/time = time2text(world.realtime,"hh:mm:ss")
-					lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [name]([key])")
-					set_zeroth_law("Only [user.real_name] and people he designates as being such are Syndicate Agents.")
-					src << "\red ALERT: Foreign software detected."
-					sleep(5)
-					src << "\red Initiating diagnostics..."
-					sleep(20)
-					src << "\red SynBorg v1.7 loaded."
-					sleep(5)
-					src << "\red LAW SYNCHRONISATION ERROR"
-					sleep(5)
-					src << "\red Would you like to send a report to NanoTraSoft? Y/N"
-					sleep(10)
-					src << "\red > N"
-					sleep(20)
-					src << "\red ERRORERRORERROR"
-					src << "<b>Obey these laws:</b>"
-					laws.show_laws(src)
-					src << "\red \b ALERT: [user.real_name] is your new master. Obey your new laws and his commands."
-					if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
-						for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
-							del(D)
-						src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
-						src.module.rebuild()
-					updateicon()
-				else
-					user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface."
-					if(prob(25))
-						src << "Hack attempt detected."
-			return
-
 	else if(istype(W, /obj/item/borg/upgrade/))
 		var/obj/item/borg/upgrade/U = W
 		if(!opened)
@@ -322,6 +260,68 @@ They can only use one tool at a time, they can't choose modules, and they have 1
 	else
 		spark_system.start()
 		return ..()
+		
+/mob/living/silicon/robot/mommi/emag_act(user as mob)
+	if(!opened)//Cover is closed
+		if(locked)
+			if(prob(90))
+				user << "You emag the cover lock."
+				locked = 0
+			else
+				user << "You fail to emag the cover lock."
+				if(prob(25))
+					src << "Hack attempt detected."
+		else
+			user << "The cover is already unlocked."
+		return
+
+	if(opened)//Cover is open
+		if(emagged)	return//Prevents the X has hit Y with Z message also you cant emag them twice
+		if(wiresexposed)
+			user << "You must close the panel first"
+			return
+		else
+			sleep(6)
+			if(prob(50))
+				emagged = 1
+				lawupdate = 0
+				connected_ai = null
+				user << "You emag [src]'s interface."
+//					message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)].  Laws overridden.")
+				log_game("[key_name(user)] emagged cyborg [key_name(src)].  Laws overridden.")
+				clear_supplied_laws()
+				clear_inherent_laws()
+				laws = new /datum/ai_laws/syndicate_override
+				var/time = time2text(world.realtime,"hh:mm:ss")
+				lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [name]([key])")
+				set_zeroth_law("Only [user.real_name] and people he designates as being such are Syndicate Agents.")
+				src << "\red ALERT: Foreign software detected."
+				sleep(5)
+				src << "\red Initiating diagnostics..."
+				sleep(20)
+				src << "\red SynBorg v1.7 loaded."
+				sleep(5)
+				src << "\red LAW SYNCHRONISATION ERROR"
+				sleep(5)
+				src << "\red Would you like to send a report to NanoTraSoft? Y/N"
+				sleep(10)
+				src << "\red > N"
+				sleep(20)
+				src << "\red ERRORERRORERROR"
+				src << "<b>Obey these laws:</b>"
+				laws.show_laws(src)
+				src << "\red \b ALERT: [user.real_name] is your new master. Obey your new laws and his commands."
+				if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
+					for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
+						del(D)
+					src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
+					src.module.rebuild()
+				updateicon()
+			else
+				user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface."
+				if(prob(25))
+					src << "Hack attempt detected."
+		return
 
 /mob/living/silicon/robot/mommi/attack_hand(mob/user)
 	add_fingerprint(user)

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -172,41 +172,6 @@
 		user << "The machine is hermetically sealed. You can't open the case."
 		return
 
-	else if (istype(W, /obj/item/weapon/card/emag))
-
-		if(!client || stat == 2)
-			user << "\red There's not much point subverting this heap of junk."
-			return
-
-		if(emagged)
-			src << "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt."
-			user << "\red You attempt to subvert [src], but the sequencer has no effect."
-			return
-
-		user << "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker."
-		src << "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script."
-
-		var/obj/item/weapon/card/emag/emag = W
-		emag.uses--
-
-		message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)].  Laws overridden.")
-		log_game("[key_name(user)] emagged drone [key_name(src)].  Laws overridden.")
-		var/time = time2text(world.realtime,"hh:mm:ss")
-		lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [name]([key])")
-
-		emagged = 1
-		lawupdate = 0
-		connected_ai = null
-		clear_supplied_laws()
-		clear_inherent_laws()
-		laws = new /datum/ai_laws/syndicate_override
-		set_zeroth_law("Only [user.real_name] and people he designates as being such are Syndicate Agents.")
-
-		src << "<b>Obey these laws:</b>"
-		laws.show_laws(src)
-		src << "\red \b ALERT: [user.real_name] is your new master. Obey your new laws and his commands."
-		return
-
 	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
 
 		if(stat == 2)
@@ -242,6 +207,41 @@
 		return
 
 	..()
+	
+/mob/living/silicon/robot/drone/emag_act(user as mob)
+	if(!client || stat == 2)
+		user << "\red There's not much point subverting this heap of junk."
+		return
+		
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+
+	if(emagged)
+		src << "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt."
+		user << "\red You attempt to subvert [src], but the sequencer has no effect."
+		return
+
+	user << "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker."
+	src << "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script."
+
+	message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)].  Laws overridden.")
+	log_game("[key_name(user)] emagged drone [key_name(src)].  Laws overridden.")
+	var/time = time2text(world.realtime,"hh:mm:ss")
+	lawchanges.Add("[time] <B>:</B> [H.name]([H.key]) emagged [name]([key])")
+
+	emagged = 1
+	lawupdate = 0
+	connected_ai = null
+	clear_supplied_laws()
+	clear_inherent_laws()
+	laws = new /datum/ai_laws/syndicate_override
+	set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.")
+
+	src << "<b>Obey these laws:</b>"
+	laws.show_laws(src)
+	src << "\red \b ALERT: [H.real_name] is your new master. Obey your new laws and his commands."
+	return
 
 //DRONE LIFE/DEATH
 

code/modules/mob/living/silicon/robot/robot.dm

@@ -808,72 +808,6 @@
 			else
 				user << "\red Access denied."
 
-	else if(istype(W, /obj/item/weapon/card/emag))		// trying to unlock with an emag card
-		if(!opened)//Cover is closed
-			if(locked)
-				if(prob(90))
-					var/obj/item/weapon/card/emag/emag = W
-					emag.uses--
-					user << "You emag the cover lock."
-					locked = 0
-				else
-					user << "You fail to emag the cover lock."
-					if(prob(25))
-						src << "Hack attempt detected."
-			else
-				user << "The cover is already unlocked."
-			return
-
-		if(opened)//Cover is open
-			if(emagged)	return//Prevents the X has hit Y with Z message also you cant emag them twice
-			if(wiresexposed)
-				user << "You must close the panel first"
-				return
-			else
-				sleep(6)
-				if(prob(50))
-					emagged = 1
-					if(user.hud_used)
-						user.hud_used.update_robot_modules_display()	//Shows/hides the emag item if the inventory screen is already open.
-					lawupdate = 0
-					connected_ai = null
-					user << "You emag [src]'s interface."
-//					message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)].  Laws overridden.")
-					log_game("[key_name(user)] emagged cyborg [key_name(src)].  Laws overridden.")
-					clear_supplied_laws()
-					clear_inherent_laws()
-					laws = new /datum/ai_laws/syndicate_override
-					var/time = time2text(world.realtime,"hh:mm:ss")
-					lawchanges.Add("[time] <B>:</B> [user.name]([user.key]) emagged [name]([key])")
-					set_zeroth_law("Only [user.real_name] and people he designates as being such are Syndicate Agents.")
-					src << "\red ALERT: Foreign software detected."
-					sleep(5)
-					src << "\red Initiating diagnostics..."
-					sleep(20)
-					src << "\red SynBorg v1.7 loaded."
-					sleep(5)
-					src << "\red LAW SYNCHRONISATION ERROR"
-					sleep(5)
-					src << "\red Would you like to send a report to NanoTraSoft? Y/N"
-					sleep(10)
-					src << "\red > N"
-					sleep(20)
-					src << "\red ERRORERRORERROR"
-					src << "<b>Obey these laws:</b>"
-					laws.show_laws(src)
-					src << "\red \b ALERT: [user.real_name] is your new master. Obey your new laws and his commands."
-					if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
-						for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
-							del(D)
-						src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
-						src.module.rebuild()
-					updateicon()
-				else
-					user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface."
-					if(prob(25))
-						src << "Hack attempt detected."
-			return
-
 	else if(istype(W, /obj/item/borg/upgrade/))
 		var/obj/item/borg/upgrade/U = W
 		if(!opened)
@@ -894,6 +828,73 @@
 	else
 		spark_system.start()
 		return ..()
+		
+/mob/living/silicon/robot/emag_act(user as mob)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+	if(!opened)//Cover is closed
+		if(locked)
+			if(prob(90))
+				user << "You emag the cover lock."
+				locked = 0
+			else
+				user << "You fail to emag the cover lock."
+				if(prob(25))
+					src << "Hack attempt detected."
+		else
+			user << "The cover is already unlocked."
+		return
+
+	if(opened)//Cover is open
+		if(emagged)	return//Prevents the X has hit Y with Z message also you cant emag them twice
+		if(wiresexposed)
+			user << "You must close the panel first"
+			return
+		else
+			sleep(6)
+			if(prob(50))
+				emagged = 1
+				if(H.hud_used)
+					H.hud_used.update_robot_modules_display()	//Shows/hides the emag item if the inventory screen is already open.
+				lawupdate = 0
+				connected_ai = null
+				user << "You emag [src]'s interface."
+//					message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)].  Laws overridden.")
+				log_game("[key_name(user)] emagged cyborg [key_name(src)].  Laws overridden.")
+				clear_supplied_laws()
+				clear_inherent_laws()
+				laws = new /datum/ai_laws/syndicate_override
+				var/time = time2text(world.realtime,"hh:mm:ss")
+				lawchanges.Add("[time] <B>:</B> [H.name]([H.key]) emagged [name]([key])")
+				set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.")
+				src << "\red ALERT: Foreign software detected."
+				sleep(5)
+				src << "\red Initiating diagnostics..."
+				sleep(20)
+				src << "\red SynBorg v1.7 loaded."
+				sleep(5)
+				src << "\red LAW SYNCHRONISATION ERROR"
+				sleep(5)
+				src << "\red Would you like to send a report to NanoTraSoft? Y/N"
+				sleep(10)
+				src << "\red > N"
+				sleep(20)
+				src << "\red ERRORERRORERROR"
+				src << "<b>Obey these laws:</b>"
+				laws.show_laws(src)
+				src << "\red \b ALERT: [H.real_name] is your new master. Obey your new laws and his commands."
+				if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner))
+					for(var/obj/item/weapon/pickaxe/borgdrill/D in src.module.modules)
+						del(D)
+					src.module.modules += new /obj/item/weapon/pickaxe/diamonddrill(src.module)
+					src.module.rebuild()
+				updateicon()
+			else
+				user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface."
+				if(prob(25))
+					src << "Hack attempt detected."
+		return
 
 /mob/living/silicon/robot/verb/unlock_own_cover()
 	set category = "Robot Commands"

code/modules/mob/living/simple_animal/friendly/corgi.dm

@@ -471,14 +471,12 @@
 	icon_living = "borgi"
 	var/emagged = 0
 
-/mob/living/simple_animal/corgi/Ian/borgi/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if (istype(O, /obj/item/weapon/card/emag) && !emagged)
+/mob/living/simple_animal/corgi/Ian/borgi/emag_act(user as mob)
+	if (!emagged)
 		emagged = 1
 		visible_message("<span class='warning'>[user] swipes a card through [src].</span>", "<span class='notice'>You overload [src]s internal reactor.</span>")
 		spawn (1000)
 			src.explode()
-		return
-	..()
 
 /mob/living/simple_animal/corgi/Ian/borgi/proc/explode()
 	for(var/mob/M in viewers(src, null))

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -125,18 +125,6 @@
 		else
 			user << "\red You swipe your card, with no effect."
 			return 0
-	else if (istype(O, /obj/item/weapon/card/emag))
-		if (emagged)
-			user << "\red [src] is already overloaded - better run."
-			return 0
-		else
-			var/obj/item/weapon/card/emag/emag = O
-			emag.uses--
-			emagged = 1
-			user << "\blue You short out the security protocols and overload [src]'s cell, priming it to explode in a short time."
-			spawn(100)	src << "\red Your cell seems to be outputting a lot of power..."
-			spawn(200)	src << "\red Internal heat sensors are spiking! Something is badly wrong with your cell!"
-			spawn(300)	src.explode()
 
 	else
 		if(O.force)
@@ -152,6 +140,17 @@
 			for(var/mob/M in viewers(src, null))
 				if ((M.client && !( M.blinded )))
 					M.show_message("\red [user] gently taps [src] with the [O]. ")
+					
+/mob/living/simple_animal/spiderbot/emag_act(user as mob)
+	if (emagged)
+		user << "\red [src] is already overloaded - better run."
+		return 0
+	else
+		emagged = 1
+		user << "\blue You short out the security protocols and overload [src]'s cell, priming it to explode in a short time."
+		spawn(100)	src << "\red Your cell seems to be outputting a lot of power..."
+		spawn(200)	src << "\red Internal heat sensors are spiking! Something is badly wrong with your cell!"
+		spawn(300)	src.explode()
 
 /mob/living/simple_animal/spiderbot/proc/transfer_personality(var/obj/item/device/mmi/M as obj)