Merge remote-tracking branch 'upstream/dev-freeze' into dev

code/modules/admin/admin_verbs.dm

@@ -88,7 +88,8 @@ var/list/admin_verbs_admin = list(
 	/client/proc/change_human_appearance_admin,	/* Allows an admin to change the basic appearance of human-based mobs */
 	/client/proc/change_human_appearance_self,	/* Allows the human-based mob itself change its basic appearance */
 	/client/proc/change_security_level,
-	/client/proc/view_chemical_reaction_logs
+	/client/proc/view_chemical_reaction_logs,
+	/client/proc/makePAI
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,

code/modules/mob/living/bot/bot.dm

@@ -16,6 +16,7 @@
 
 	var/obj/access_scanner = null
 	var/list/req_access = list()
+	var/list/req_one_access = list()
 
 /mob/living/bot/New()
 	..()
@@ -26,14 +27,17 @@
 
 	access_scanner = new /obj(src)
 	access_scanner.req_access = req_access.Copy()
+	access_scanner.req_one_access = req_one_access.Copy()
 
 /mob/living/bot/Life()
 	..()
+	if(health <= 0)
+		death()
+		return
 	weakened = 0
 	stunned = 0
 	paralysis = 0
-	if(health <= 0)
-		death()
+	update_canmove()
 
 /mob/living/bot/updatehealth()
 	if(status_flags & GODMODE)

code/modules/mob/living/bot/secbot.dm

@@ -4,7 +4,7 @@
 	icon_state = "secbot0"
 	maxHealth = 50
 	health = 50
-	req_access = list(access_security, access_forensics_lockers)
+	req_one_access = list(access_security, access_forensics_lockers)
 	botcard_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
 
 	var/mob/target

code/modules/mob/living/silicon/pai/admin.dm

@@ -0,0 +1,21 @@
+// Originally a debug verb, made it a proper adminverb for ~fun~
+/client/proc/makePAI(turf/t in view(), name as text, pai_key as null|text)
+	set name = "Make pAI"
+	set category = "Admin"
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	if(!pai_key)
+		var/client/C = input("Select client") as null|anything in clients
+		if(!C) return
+		pai_key = C.key
+
+	log_and_message_admins("made a pAI with key=[pai_key] at ([t.x],[t.y],[t.z])")
+	var/obj/item/device/paicard/card = new(t)
+	var/mob/living/silicon/pai/pai = new(card)
+	pai.key = pai_key
+	card.setPersonality(pai)
+
+	if(name)
+		pai.SetName(name)

code/modules/nano/interaction/default.dm

@@ -15,7 +15,7 @@
 	return STATUS_UPDATE						// Ghosts can view updates
 
 /mob/living/silicon/pai/default_can_use_topic(var/src_object)
-	if(src_object == src && !stat)
+	if((src_object == src || src_object == radio) && !stat)
 		return STATUS_INTERACTIVE
 	else
 		return ..()