Merge resolution with PDA nanoui.

code/datums/mind.dm

@@ -510,14 +510,9 @@ datum/mind
 								I.Del()
 								break
 					H << "\blue <Font size =3><B>Your loyalty implant has been deactivated.</B></FONT>"
-				if("add")
-					var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H)
-					L.imp_in = H
-					L.implanted = 1
-					var/datum/organ/external/affected = H.organs_by_name["head"]
-					affected.implants += L
-					L.part = affected
 
+				if("add")
+					H.implant_loyalty(H, override = TRUE)
 					H << "\red <Font size =3><B>You somehow have become the recepient of a loyalty transplant, and it just activated!</B></FONT>"
 					if(src in ticker.mode.revolutionaries)
 						special_role = null
@@ -541,6 +536,8 @@ datum/mind
 						special_role = null
 						current << "\red <FONT size = 3><B>The nanobots in the loyalty implant remove all thoughts about being a traitor to Nanotrasen.  Have a nice day!</B></FONT>"
 						log_admin("[key_name_admin(usr)] has de-traitor'ed [current].")
+				else
+
 
 		else if (href_list["revolution"])
 			current.hud_updateflag |= (1 << SPECIALROLE_HUD)

code/datums/supplypacks.dm

@@ -697,14 +697,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	access = access_armory
 	group = "Security"
 
-/datum/supply_packs/loyalty
-	name = "Loyalty implant crate"
-	contains = list (/obj/item/weapon/storage/lockbox/loyalty)
-	cost = 60
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Loyalty implant crate"
-	access = access_armory
-	group = "Security"
 
 /datum/supply_packs/ballistic
 	name = "Ballistic gear crate"
@@ -741,6 +733,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	access = access_armory
 	group = "Security"
 
+/*
+/datum/supply_packs/loyalty
+	name = "Loyalty implant crate"
+	contains = list (/obj/item/weapon/storage/lockbox/loyalty)
+	cost = 60
+	containertype = /obj/structure/closet/crate/secure
+	containername = "Loyalty implant crate"
+	access = access_armory
+	group = "Security"
+*/
+
 /datum/supply_packs/expenergy
 	name = "Experimental energy gear crate"
 	contains = list(/obj/item/clothing/suit/armor/laserproof,