Merge pull request #9430 from Ghommie/Ghommie-cit220

Ports "Adds three new .38 ammo types", also lazily adding .357 AP

code/game/objects/items/implants/implant_track.dm

@@ -1,7 +1,19 @@
 /obj/item/implant/tracking
 	name = "tracking implant"
 	desc = "Track with this."
-	activated = 0
+	activated = FALSE
+	var/lifespan_postmortem = 10 MINUTES //for how many deciseconds after user death will the implant work?
+	var/allow_teleport = TRUE //will people implanted with this act as teleporter beacons?
+
+/obj/item/implant/tracking/c38
+	name = "TRAC implant"
+	desc = "A smaller tracking implant that supplies power for only a few minutes."
+	var/lifespan = 5 MINUTES //how many deciseconds does the implant last?
+	allow_teleport = FALSE
+
+/obj/item/implant/tracking/c38/Initialize()
+	. = ..()
+	QDEL_IN(src, lifespan)
 
 /obj/item/implant/tracking/Initialize()
 	. = ..()
@@ -45,7 +57,7 @@
 	var/dat = {"<b>Implant Specifications:</b><BR>
 				<b>Name:</b> Tracking Beacon<BR>
 				<b>Life:</b> 10 minutes after death of host<BR>
-				<b>Important Notes:</b> None<BR>
+				<b>Important Notes:</b> Implant also works as a teleporter beacon.<BR>
 				<HR>
 				<b>Implant Details:</b> <BR>
 				<b>Function:</b> Continuously transmits low power signal. Useful for tracking.<BR>

code/game/objects/items/teleportation.dm

@@ -79,7 +79,7 @@
 						continue
 					var/mob/living/M = W.imp_in
 					if (M.stat == DEAD)
-						if (M.timeofdeath + 6000 < world.time)
+						if (M.timeofdeath + W.lifespan_postmortem < world.time)
 							continue
 
 					var/turf/tr = get_turf(M)