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

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

@@ -169,19 +169,13 @@
 				<table class="request">
 					<tr>
 						<td class="radio">Transmit:</td>
-						<td><a href='byond://?src=\ref[src];wires=4'>[(radio.wires & 4) ? "<font color=#55FF55>En" : "<font color=#FF5555>Dis" ]abled</font></a>
+						<td><a href='byond://?src=\ref[src];wires=4'>[radio.broadcasting ? "<font color=#55FF55>En" : "<font color=#FF5555>Dis" ]abled</font></a>
 
 						</td>
 					</tr>
 					<tr>
 						<td class="radio">Receive:</td>
-						<td><a href='byond://?src=\ref[src];wires=2'>[(radio.wires & 2) ? "<font color=#55FF55>En" : "<font color=#FF5555>Dis" ]abled</font></a>
-
-						</td>
-					</tr>
-					<tr>
-						<td class="radio">Signal Pulser:</td>
-						<td><a href='byond://?src=\ref[src];wires=1'>[(radio.wires & 1) ? "<font color=#55FF55>En" : "<font color=#FF5555>Dis" ]abled</font></a>
+						<td><a href='byond://?src=\ref[src];wires=2'>[radio.listening ? "<font color=#55FF55>En" : "<font color=#FF5555>Dis" ]abled</font></a>
 
 						</td>
 					</tr>
@@ -261,10 +255,11 @@
 			removePersonality()
 	if(href_list["wires"])
 		var/t1 = text2num(href_list["wires"])
-		if (radio.wires & t1)
-			radio.wires &= ~t1
-		else
-			radio.wires |= t1
+		switch(t1)
+			if(4)
+				radio.ToggleBroadcast()
+			if(2)
+				radio.ToggleReception()
 	if(href_list["setlaws"])
 		var/newlaws = copytext(sanitize(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.pai_laws) as message),1,MAX_MESSAGE_LEN)
 		if(newlaws)
@@ -315,4 +310,4 @@
 	if(pai)
 		pai.ex_act(severity)
 	else
-		del(src)
+		del(src)

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

@@ -108,6 +108,12 @@
 			Speaker: <A href='byond://?src=\ref[src];ch_name=[chan_name];listen=[!list]'>[list ? "Engaged" : "Disengaged"]</A><BR>
 			"}
 
+/obj/item/device/radio/proc/ToggleBroadcast()
+	broadcasting = !broadcasting && !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL))
+
+/obj/item/device/radio/proc/ToggleReception()
+	listening = !listening && !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
+
 /obj/item/device/radio/Topic(href, href_list)
 	//..()
 	if (usr.stat || !on)
@@ -135,11 +141,11 @@
 				return
 
 	else if (href_list["talk"])
-		broadcasting = !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL)) && text2num(href_list["talk"])
+		ToggleBroadcast()
 	else if (href_list["listen"])
 		var/chan_name = href_list["ch_name"]
 		if (!chan_name)
-			listening = !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL)) && text2num(href_list["listen"])
+			ToggleReception()
 		else
 			if (channels[chan_name] & FREQ_LISTENING)
 				channels[chan_name] &= ~FREQ_LISTENING

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

@@ -128,11 +128,7 @@ datum/nano_item_lists
 			var/mob/living/carbon/human/A = usr
 			A.put_in_any_hand_if_possible(I)
 
-		if(istype(I ,/obj/item/weapon/storage/box/) && I.contents.len>0)
-			for(var/atom/o in I)
-				purchase_log += "\icon[o]"
-		else
-			purchase_log += "\icon[I]"
+		purchase_log[UI] = purchase_log[UI] + 1
 
 		return 1
 	return 0
@@ -192,7 +188,7 @@ datum/nano_item_lists
 	data["menu"] = nanoui_menu
 	data["nano_items"] = nanoui_items
 	data += nanoui_data
-	
+
 	// update the ui if it exists, returns null if no ui is passed/found
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)

code/game/objects/items/weapons/RCD.dm

@@ -59,7 +59,7 @@
 	if(!proximity) return
 	if(disabled && !isrobot(user))
 		return 0
-	if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
+	if(istype(get_area(A),/area/shuttle)||istype(get_area(A),/turf/space/transit))
 		return 0
 	return alter_turf(A,user,(mode == 3))
 

code/game/objects/items/weapons/tape.dm

@@ -45,6 +45,7 @@
 	W.forceMove(src)
 	icon_state = W.icon_state + "_taped"
 	name = W.name + " (taped)"
+	overlays = W.overlays
 
 /obj/item/weapon/ducttape/attack_self(mob/user as mob)
 	if(!stuck)
@@ -56,6 +57,7 @@
 	stuck.forceMove(get_turf(src))
 	user.put_in_hands(stuck)
 	stuck = null
+	overlays = null
 	del(src)
 
 /obj/item/weapon/ducttape/afterattack(var/A, mob/user as mob, flag, params)