Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes

Fixes

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

@@ -4,8 +4,8 @@
 	var/obj/item/device/assembly/signaler/signaler
 	icon_state = "implant_evil"
 
-	get_data()
-		var/dat = {"
+/obj/item/weapon/implant/deadman/get_data()
+	var/dat = {"
 <b>Implant Specifications:</b><BR>
 <b>Name:</b> Robust Corp RX-79 Deadman Switch Implant<BR>
 <b>Life:</b> Activates upon death.<BR>
@@ -14,23 +14,22 @@
 <b>Implant Details:</b><BR>
 <b>Function:</b> Contains a compact, electric signaller that activates upon host death.<BR>
 <b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
-		return dat
+	return dat
 
-	implanted(mob/source as mob)
-		signaler = new /obj/item/device/assembly/signaler(src)
-		signaler.interact(source)
-		usr.mind.store_memory("Deadman switch will broadcast signal on <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>.", 0, 0)
-		usr << "Deadman switch will broadcast signal on <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>."
+/obj/item/weapon/implant/deadman/implanted(mob/source as mob)
+	signaler = new /obj/item/device/assembly/signaler(src)
+	signaler.interact(source)
+	usr.mind.store_memory("Deadman switch will broadcast signal on <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>.", 0, 0)
+	usr << "Deadman switch will broadcast signal on <B>[signaler.frequency]</B> using encryption <B>[signaler.code]</B>."
 
+/obj/item/weapon/implant/deadman/trigger(emote, source as mob)
+	if(emote == "deathgasp")
+		src.activate("death")
+	return
 
-	trigger(emote, source as mob)
-		if(emote == "deathgasp")
-			src.activate("death")
-		return
+/obj/item/weapon/implant/deadman/activate(var/cause)
+	if((!cause) || (!src.imp_in))	return 0
+	signaler.signal()
 
-	activate(var/cause)
-		if((!cause) || (!src.imp_in))	return 0
-		signaler.signal()
-
-	islegal()
-		return 0
+/obj/item/weapon/implant/deadman/islegal()
+	return 0

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

@@ -116,7 +116,6 @@ Implant Specifics:<BR>"}
 <b>Integrity:</b> Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
 	return dat
 
-
 /obj/item/weapon/implant/dexplosive/trigger(emote, source as mob)
 	if(emote == "deathgasp")
 		src.activate("death")