Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello

code/datums/spells/mind_transfer.dm

@@ -20,15 +20,8 @@ Make sure spells that are removed from spell_list are actually removed and delet
 Also, you never added distance checking after target is selected. I've went ahead and did that.
 */
 /obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets, mob/user = usr, distanceoverride)
-	if(!targets.len)
-		to_chat(user, "No mind found.")
-		return
 
-	if(targets.len > 1)
-		to_chat(user, "Too many minds! You're not a hive damnit!")//Whaa...aat?
-		return
-
-	var/mob/living/target = targets[1]
+	var/mob/living/target = targets[range]
 
 	if(!(target in oview(range)) && !distanceoverride)//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it.
 		to_chat(user, "They are too far away!")
@@ -50,6 +43,10 @@ Also, you never added distance checking after target is selected. I've went ahea
 		to_chat(user, "Their mind is resisting your spell.")
 		return
 
+	if(istype(target, /mob/living/silicon))
+		to_chat(user, "You feel this enslaved being is just as dead as its cold, hard exoskeleton.")
+		return
+
 	var/mob/living/victim = target//The target of the spell whos body will be transferred to.
 	var/mob/caster = user//The wizard/whomever doing the body transferring.
 

code/datums/statclick.dm

@@ -5,8 +5,8 @@
 	var/target
 
 /obj/effect/statclick/New(ntarget, text)
-	name = text
 	target = ntarget
+	name = text
 
 /obj/effect/statclick/proc/update(text)
 	name = text
@@ -15,25 +15,22 @@
 /obj/effect/statclick/debug
 	var/class
 
-/obj/effect/statclick/debug/New(ntarget)
-	name = "Initializing..."
-	target = ntarget
-	if(istype(target, /datum/controller/process))
-		class = "process"
-	else if(istype(target, /datum/controller/processScheduler))
-		class = "scheduler"
-	else if(istype(target, /datum/controller))
-		class = "controller"
-	else if(istype(target, /datum))
-		class = "datum"
-	else
-		class = "unknown"
-
-// This bit is called when clicked in the stat panel
 /obj/effect/statclick/debug/Click()
-	if(!is_admin(usr))
+	if(!is_admin(usr) || !target)
 		return
+	if(!class)
+		if(istype(target, /datum/controller/process))
+			class = "process"
+		else if(istype(target, /datum/controller/processScheduler))
+			class = "scheduler"
+		if(istype(target, /datum/controller/subsystem))
+			class = "subsystem"
+		else if(istype(target, /datum/controller))
+			class = "controller"
+		else if(istype(target, /datum))
+			class = "datum"
+		else
+			class = "unknown"
 
 	usr.client.debug_variables(target)
-
-	message_admins("Admin [key_name_admin(usr)] is debugging the [target] [class].")
+	message_admins("Admin [key_name_admin(usr)] is debugging the [target] [class].")

code/datums/uplink_item.dm

@@ -963,6 +963,13 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/storage/backpack/duffel/syndie/surgery
 	cost = 4
 
+/datum/uplink_item/device_tools/bonerepair
+	name = "Prototype Bone Repair Kit"
+	desc = "Stolen prototype bone repair nanites. Contains one nanocalcium autoinjector and guide."
+	reference = "NCAI"
+	item = /obj/item/weapon/storage/box/syndie_kit/bonerepair
+	cost = 6
+
 /datum/uplink_item/device_tools/military_belt
 	name = "Military Belt"
 	desc = "A robust seven-slot red belt made for carrying a broad variety of weapons, ammunition and explosives"

code/datums/wires/airlock.dm

@@ -164,9 +164,10 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
 			//one wire for door bolts. Sending a pulse through this drops door bolts if they're not down (whether power's on or not),
 			//raises them if they are down (only if power's on)
 			if(!A.locked)
-				A.lock()
-			else
-				A.unlock()
+				if(A.lock())
+					A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
+			else if(A.unlock())
+				A.audible_message("<span class='italics'>You hear a click from the bottom of the door.</span>", null,  1)
 
 		if(AIRLOCK_WIRE_BACKUP_POWER1)
 			//two wires for backup power. Sending a pulse through either one causes a breaker to trip, but this does not disable it unless main power is down too (in which case it is disabled for 1 minute or however long it takes main power to come back, whichever is shorter).