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

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm

baystation12.dme

@@ -1248,6 +1248,7 @@
 #include "code\modules\mob\living\silicon\decoy\death.dm"
 #include "code\modules\mob\living\silicon\decoy\decoy.dm"
 #include "code\modules\mob\living\silicon\decoy\life.dm"
+#include "code\modules\mob\living\silicon\pai\admin.dm"
 #include "code\modules\mob\living\silicon\pai\death.dm"
 #include "code\modules\mob\living\silicon\pai\examine.dm"
 #include "code\modules\mob\living\silicon\pai\life.dm"

code/game/objects/items/devices/radio/radio.dm

@@ -156,6 +156,9 @@
 			else
 				channels[chan_name] |= FREQ_LISTENING
 
+	if(href_list["nowindow"]) // here for pAIs, maybe others will want it, idk
+		return
+
 	interact(usr)
 
 /obj/item/device/radio/proc/autosay(var/message, var/from, var/channel) //BS12 EDIT

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/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 ..()

nano/templates/pai_radio.tmpl

@@ -8,11 +8,11 @@ code/modules/mob/living/silicon/pai/software_modules.dm
 	</div>
 	<div class="itemContent">
 		{{if data.listening}}
-			{{:helper.link("On", '', {"stopic":"radio", "talk":1}, 'selected')}}
-			{{:helper.link("Off", '', {"stopic":"radio", "talk":1})}}
+			{{:helper.link("On", '', {"stopic":"radio", "talk":1, "nowindow":1}, 'selected')}}
+			{{:helper.link("Off", '', {"stopic":"radio", "talk":1, "nowindow":1})}}
 		{{else}}
-			{{:helper.link("On", '', {"stopic":"radio", "talk":1})}}
-			{{:helper.link("Off", '', {"stopic":"radio", "talk":1}, 'selected')}}
+			{{:helper.link("On", '', {"stopic":"radio", "talk":1, "nowindow":1})}}
+			{{:helper.link("Off", '', {"stopic":"radio", "talk":1, "nowindow":1}, 'selected')}}
 		{{/if}}
 	</div>
 </div>
@@ -22,11 +22,11 @@ code/modules/mob/living/silicon/pai/software_modules.dm
 		Frequency:
 	</div>
 	<div class="itemContent">
-		{{:helper.link("--", '', {"stopic":"radio", "freq":-10})}}
-		{{:helper.link("-",  '', {"stopic":"radio", "freq": -2})}}
+		{{:helper.link("--", '', {"stopic":"radio", "freq":-10, "nowindow":1})}}
+		{{:helper.link("-",  '', {"stopic":"radio", "freq": -2, "nowindow":1})}}
 		<div style="float: left; width: 80px; text-align: center;">{{:data.frequency}}</div>
-		{{:helper.link("+",  '', {"stopic":"radio", "freq":  2})}}
-		{{:helper.link("++", '', {"stopic":"radio", "freq": 10})}}
+		{{:helper.link("+",  '', {"stopic":"radio", "freq":  2, "nowindow":1})}}
+		{{:helper.link("++", '', {"stopic":"radio", "freq": 10, "nowindow":1})}}
 	</div>
 </div>
 
@@ -37,12 +37,12 @@ code/modules/mob/living/silicon/pai/software_modules.dm
 	</div>
 	<div class="itemContent">
 		{{if value.listening}}
-			{{:helper.link("On", '', {"stopic":"radio", "channel":value.name, "listen":1}, 'selected')}}
-			{{:helper.link("Off", '', {"stopic":"radio", "channel":value.name, "listen":1})}}
+			{{:helper.link("On", '', {"stopic":"radio", "channel":value.name, "listen":1, "nowindow":1}, 'selected')}}
+			{{:helper.link("Off", '', {"stopic":"radio", "channel":value.name, "listen":1, "nowindow":1})}}
 		{{else}}
-			{{:helper.link("On", '', {"stopic":"radio", "channel":value.name, "listen":1})}}
-			{{:helper.link("Off", '', {"stopic":"radio", "channel":value.name, "listen":1}, 'selected')}}
+			{{:helper.link("On", '', {"stopic":"radio", "channel":value.name, "listen":1, "nowindow":1})}}
+			{{:helper.link("Off", '', {"stopic":"radio", "channel":value.name, "listen":1, "nowindow":1}, 'selected')}}
 		{{/if}}
 	</div>
 </div>
-{{/for}}
+{{/for}}