Fixes merge conflict

code/game/objects/items/weapons/implants/implant.dm

@@ -5,7 +5,7 @@
 	action_button_custom_type = /datum/action/item_action/hands_free
 	origin_tech = "materials=2;biotech=3;programming=2"
 
-	var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like loyalty implants
+	var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like mindshield implants
 	var/implanted = null
 	var/mob/living/imp_in = null
 	item_color = "b"

code/game/objects/items/weapons/implants/implant_chem.dm

@@ -41,7 +41,7 @@
 	if(!cause || !imp_in)	return 0
 	var/mob/living/carbon/R = imp_in
 	var/injectamount = null
-	if (cause == "action_button")
+	if(cause == "action_button")
 		injectamount = reagents.total_volume
 	else
 		injectamount = cause

code/game/objects/items/weapons/implants/implant_death_alarm.dm

@@ -33,7 +33,7 @@
 /obj/item/weapon/implant/death_alarm/activate(var/cause)
 	var/mob/M = imp_in
 	var/area/t = get_area(M)
-	switch (cause)
+	switch(cause)
 		if("death")
 			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 			if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
@@ -43,7 +43,7 @@
 				a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
 			qdel(a)
 			qdel(src)
-		if ("emp")
+		if("emp")
 			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 			var/name = prob(50) ? t.name : pick(teleportlocs)
 			a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
@@ -68,4 +68,4 @@
 	if(..())
 		processing_objects.Remove(src)
 		return 1
-	return 0
+	return 0

code/game/objects/items/weapons/implants/implant_explosive.dm

@@ -125,4 +125,46 @@
 
 /obj/item/weapon/implanter/explosive_macro/New()
 	imp = new /obj/item/weapon/implant/explosive/macro(src)
+	..()
+
+
+// Dust implant, for CC officers. Prevents gear theft if they die.
+
+/obj/item/weapon/implant/dust
+	name = "duster implant"
+	desc = "An alarm which monitors host vital signs, transmitting a radio message and dusting the corpse on death."
+
+/obj/item/weapon/implant/dust/get_data()
+	var/dat = {"<b>Implant Specifications:</b><BR>
+				<b>Name:</b> Ultraviolet Corp XX-13 Security Implant<BR>
+				<b>Life:</b> Activates upon death.<BR>
+				<b>Important Notes:</b> Vaporizes organic matter<BR>
+				<HR>
+				<b>Implant Details:</b><BR>
+				<b>Function:</b> Contains a compact, electrically activated heat source that turns its host to ash upon activation, or their death. <BR>
+				<b>Special Features:</b> Vaporizes<BR>
+				"}
+	return dat
+
+/obj/item/weapon/implant/dust/trigger(emote, mob/source)
+	if(emote == "deathgasp")
+		activate("death")
+
+/obj/item/weapon/implant/dust/activate(cause)
+	if(!cause || !imp_in || cause == "emp")
+		return 0
+	if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your dusting implant? This will turn you to ash!", "Dusting Confirmation", "Yes", "No") != "Yes")
+		return 0
+	to_chat(imp_in, "<span class='notice'>Your dusting implant activates!</span>")
+	imp_in.visible_message("<span class = 'warning'>[imp_in] burns up in a flash!</span>")
+	imp_in.dust()
+
+/obj/item/weapon/implant/dust/emp_act(severity)
+	return
+
+/obj/item/weapon/implanter/dust
+	name = "implanter (Dust-on-death)"
+
+/obj/item/weapon/implanter/dust/New()
+	imp = new /obj/item/weapon/implant/dust(src)
 	..()

code/game/objects/items/weapons/implants/implant_mindshield.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/implant/loyalty
-	name = "loyalty implant"
-	desc = "Makes you loyal or such."
+	name = "mindshield implant"
+	desc = "Stops people messing with your mind."
 	origin_tech = "materials=2;biotech=4;programming=4"
 	activated = 0
 
@@ -8,7 +8,7 @@
 	var/dat = {"<b>Implant Specifications:</b><BR>
 				<b>Name:</b> Nanotrasen Employee Management Implant<BR>
 				<b>Life:</b> Ten years.<BR>
-				<b>Important Notes:</b> Personnel injected with this device tend to be much more loyal to the company.<BR>
+				<b>Important Notes:</b> Personnel injected with this device can better resist mental compulsions.<BR>
 				<HR>
 				<b>Implant Details:</b><BR>
 				<b>Function:</b> Contains a small pod of nanobots that manipulate the host's mental functions.<BR>
@@ -29,7 +29,7 @@
 		if(target.mind in ticker.mode.cult)
 			to_chat(target, "<span class='warning'>You feel the corporate tendrils of Nanotrasen try to invade your mind!</span>")
 		else
-			to_chat(target, "<span class='notice'>You feel a surge of loyalty towards Nanotrasen.</span>")
+			to_chat(target, "<span class='notice'>Your mind feels hardened - more resistant to brainwashing.</span>")
 		return 1
 	return 0
 
@@ -42,7 +42,7 @@
 
 
 /obj/item/weapon/implanter/loyalty
-	name = "implanter (loyalty)"
+	name = "implanter (mindshield)"
 
 /obj/item/weapon/implanter/loyalty/New()
 	imp = new /obj/item/weapon/implant/loyalty(src)
@@ -51,8 +51,8 @@
 
 
 /obj/item/weapon/implantcase/loyalty
-	name = "implant case - 'Loyalty'"
-	desc = "A glass case containing a loyalty implant."
+	name = "implant case - 'mindshield'"
+	desc = "A glass case containing a mindshield implant."
 
 /obj/item/weapon/implantcase/loyalty/New()
 	imp = new /obj/item/weapon/implant/loyalty(src)

code/game/objects/items/weapons/implants/implant_misc.dm

@@ -56,7 +56,7 @@
 	uses = 2
 
 /obj/item/weapon/implant/emp/activate()
-	if (src.uses < 1)	return 0
+	if(src.uses < 1)	return 0
 	src.uses--
 	empulse(imp_in, 3, 5)
 

code/game/objects/items/weapons/implants/implantchair.dm

@@ -1,8 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
 
 /obj/machinery/implantchair
-	name = "loyalty implanter"
-	desc = "Used to implant occupants with loyalty implants."
+	name = "mindshield implanter"
+	desc = "Used to implant occupants with mindshield implants."
 	icon = 'icons/obj/machines/implantchair.dmi'
 	icon_state = "implantchair"
 	density = 1
@@ -94,7 +94,7 @@
 		return
 	if(M == occupant) // so that the guy inside can't eject himself -Agouri
 		return
-	if (src.occupant.client)
+	if(src.occupant.client)
 		src.occupant.client.eye = src.occupant.client.mob
 		src.occupant.client.perspective = MOB_PERSPECTIVE
 	src.occupant.loc = src.loc
@@ -125,7 +125,7 @@
 
 
 /obj/machinery/implantchair/implant(mob/M)
-	if (!istype(M, /mob/living/carbon))
+	if(!istype(M, /mob/living/carbon))
 		return
 	if(!implant_list.len)	return
 	for(var/obj/item/weapon/implant/loyalty/imp in implant_list)

code/game/objects/items/weapons/implants/implanter.dm

@@ -32,7 +32,7 @@
 		if(T && (M == user || do_after(user, 50, target = M)))
 			if(user && M && (get_turf(M) == T) && src && imp)
 				if(imp.implant(M, user))
-					if (M == user)
+					if(M == user)
 						to_chat(user, "<span class='notice'>You implant yourself.</span>")
 					else
 						M.visible_message("[user] has implanted [M].", "<span class='notice'>[user] implants you.</span>")
@@ -87,3 +87,9 @@
 	imp = new /obj/item/weapon/implant/traitor(src)
 	..()
 
+/obj/item/weapon/implanter/death_alarm
+	name = "implanter (Death Alarm)"
+
+/obj/item/weapon/implanter/death_alarm/New()
+	imp = new /obj/item/weapon/implant/death_alarm(src)
+	..()

code/game/objects/items/weapons/implants/implantpad.dm

@@ -55,7 +55,7 @@
 	set name = "Remove Implant"
 	set src in usr
 
-	if (usr.stat || usr.restrained())
+	if(usr.stat || usr.restrained())
 		return
 
 	dropcase(usr)
@@ -70,7 +70,7 @@
 	add_fingerprint(user)
 	user.set_machine(src)
 	var/dat = "<B>Implant Mini-Computer:</B><HR>"
-	if (case)
+	if(case)
 		if(case.imp)
 			if(istype(case.imp, /obj/item/weapon/implant))
 				dat += "<A href='byond://?src=\ref[src];removecase=1'>Remove Case</A><HR>"
@@ -96,7 +96,7 @@
 		return 1
 
 	var/mob/living/user = usr
-	if (href_list["tracking_id"])
+	if(href_list["tracking_id"])
 		if(case && case.imp)
 			var/obj/item/weapon/implant/tracking/T = case.imp
 			T.id += text2num(href_list["tracking_id"])