Merge remote-tracking branch 'origin/master' into TGUI-4

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

@@ -38,6 +38,23 @@
 	if(!uses)
 		qdel(src)
 
+/obj/item/implant/warp
+	name = "warp implant"
+	desc = "Saves your position somewhere, and then warps you back to it after five seconds."
+	icon_state = "warp"
+	uses = 15
+
+/obj/item/implant/warp/activate()
+	. = ..()
+	uses--
+	imp_in.do_adrenaline(150, TRUE, 0, 0, TRUE, list(/datum/reagent/fermi/eigenstate = 1.2), "<span class='boldnotice'>You feel an internal prick as as the bluespace starts ramping up!</span>")
+	to_chat(imp_in, "<span class='notice'>You feel an internal prick as as the bluespace starts ramping up!</span>")
+	if(!uses)
+		qdel(src)
+
+/obj/item/implanter/warp
+	name = "implanter (warp)"
+	imp_type = /obj/item/implant/warp
 
 /obj/item/implant/emp
 	name = "emp implant"