Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods

code/game/machinery/cloning.dm

@@ -175,11 +175,12 @@
 
 	//Get the clone body ready
 	maim_clone(H)
-	ADD_TRAIT(H, TRAIT_STABLEHEART, "cloning")
-	ADD_TRAIT(H, TRAIT_EMOTEMUTE, "cloning")
-	ADD_TRAIT(H, TRAIT_MUTE, "cloning")
-	ADD_TRAIT(H, TRAIT_NOBREATH, "cloning")
-	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, "cloning")
+	ADD_TRAIT(H, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_STABLELIVER, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_MUTE, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_NOBREATH, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
 	H.Unconscious(80)
 
 	clonemind.transfer_to(H)
@@ -361,11 +362,12 @@
 	if(!mob_occupant)
 		return
 
-	REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, "cloning")
-	REMOVE_TRAIT(mob_occupant, TRAIT_EMOTEMUTE, "cloning")
-	REMOVE_TRAIT(mob_occupant, TRAIT_MUTE, "cloning")
-	REMOVE_TRAIT(mob_occupant, TRAIT_NOCRITDAMAGE, "cloning")
-	REMOVE_TRAIT(mob_occupant, TRAIT_NOBREATH, "cloning")
+	REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
+	REMOVE_TRAIT(mob_occupant, TRAIT_STABLELIVER, CLONING_POD_TRAIT)
+	REMOVE_TRAIT(mob_occupant, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
+	REMOVE_TRAIT(mob_occupant, TRAIT_MUTE, CLONING_POD_TRAIT)
+	REMOVE_TRAIT(mob_occupant, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
+	REMOVE_TRAIT(mob_occupant, TRAIT_NOBREATH, CLONING_POD_TRAIT)
 
 	if(grab_ghost_when == CLONER_MATURE_CLONE)
 		mob_occupant.grab_ghost()

code/game/machinery/computer/teleporter.dm

@@ -10,6 +10,7 @@
 	var/obj/machinery/teleport/station/power_station
 	var/calibrating
 	var/turf/target
+	var/obj/item/implant/imp_t
 
 /obj/machinery/computer/teleporter/Initialize()
 	. = ..()
@@ -109,6 +110,9 @@
 
 /obj/machinery/computer/teleporter/proc/reset_regime()
 	target = null
+	if(imp_t)
+		UnregisterSignal(imp_t, COMSIG_IMPLANT_REMOVING)
+		imp_t = null
 	if(regime_set == "Teleporter")
 		regime_set = "Gate"
 	else
@@ -132,10 +136,24 @@
 					if(M.timeofdeath + 6000 < world.time)
 						continue
 				if(is_eligible(M))
-					L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = I
+					L[avoid_assoc_duplicate_keys(M.real_name, areaindex)] = M
 
 		var/desc = input("Please select a location to lock in.", "Locking Computer") as null|anything in L
+		if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) //check if we are still around
+			return
 		target = L[desc]
+		if(imp_t)
+			UnregisterSignal(imp_t, COMSIG_IMPLANT_REMOVING)
+			imp_t = null
+		if(isliving(target)) //make sure the living mob is still implanted to be a valid target
+			var/mob/living/M = target
+			var/obj/item/implant/tracking/I = locate() in M.implants
+			if(I)
+				RegisterSignal(I, COMSIG_IMPLANT_REMOVING, .proc/untarget_implant)
+				imp_t = I
+			else
+				target = null
+				return
 		var/turf/T = get_turf(target)
 		log_game("[key_name(user)] has set the teleporter target to [target] at [AREACOORD(T)]")
 
@@ -149,6 +167,8 @@
 			to_chat(user, "<span class='alert'>No active connected stations located.</span>")
 			return
 		var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L
+		if(!user.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) //again, check if we are still around
+			return
 		var/obj/machinery/teleport/station/target_station = L[desc]
 		if(!target_station || !target_station.teleporter_hub)
 			return
@@ -164,6 +184,14 @@
 			target_station.teleporter_console.stat &= ~NOPOWER
 			target_station.teleporter_console.update_icon()
 
+/obj/machinery/computer/teleporter/proc/untarget_implant() //untargets from mob the racker was once implanted in to prevent issues.
+	target = null
+	if(power_station)
+		power_station.engaged = FALSE
+		power_station.teleporter_hub?.update_icon()
+	UnregisterSignal(imp_t, COMSIG_IMPLANT_REMOVING)
+	imp_t = null
+
 /obj/machinery/computer/teleporter/proc/is_eligible(atom/movable/AM)
 	var/turf/T = get_turf(AM)
 	if(!T)

code/game/machinery/exp_cloner.dm

@@ -42,11 +42,12 @@
 	icon_state = "pod_1"
 	//Get the clone body ready
 	maim_clone(H)
-	ADD_TRAIT(H, TRAIT_STABLEHEART, "cloning")
-	ADD_TRAIT(H, TRAIT_EMOTEMUTE, "cloning")
-	ADD_TRAIT(H, TRAIT_MUTE, "cloning")
-	ADD_TRAIT(H, TRAIT_NOBREATH, "cloning")
-	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, "cloning")
+	ADD_TRAIT(H, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_STABLELIVER, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_EMOTEMUTE, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_MUTE, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_NOBREATH, CLONING_POD_TRAIT)
+	ADD_TRAIT(H, TRAIT_NOCRITDAMAGE, CLONING_POD_TRAIT)
 	H.Unconscious(80)
 
 	var/list/candidates = pollCandidatesForMob("Do you want and agree to play as a [clonename]'s defective clone, respect their character and not engage in ERP without permission from the original?", null, null, null, 100, H, POLL_IGNORE_CLONE)