Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge

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

@@ -523,10 +523,10 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 		data["feed"] = feed
 
+	data["manifest"] = list("__json_cache" = ManifestJSON)
+
 	nanoUI = data
 	// update the ui if it exists, returns null if no ui is passed/found
-	if(ui)
-		ui.load_cached_data(ManifestJSON)
 
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
@@ -536,8 +536,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		ui = new(user, src, ui_key, "pda.tmpl", title, 520, 400, state = inventory_state)
 		// when the ui is first opened this is the data it will use
 
-		ui.load_cached_data(ManifestJSON)
-
 		ui.set_initial_data(data)
 		// open the new ui window
 		ui.open()

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

@@ -108,7 +108,7 @@
 			mode_nice = design
 			mode = "[replacetext(design, "-", "")]full"
 		if("corner")
-			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-grey", "white-red", "white-blue", "white-green", "white-yellow", "white-purple")
+			var/design = input("Which design?", "Floor painter") in list("black", "red", "blue", "green", "yellow", "purple", "neutral", "white", "white-red", "white-blue", "white-green", "white-yellow", "white-purple")
 			mode_nice = "[design] corner"
 			mode = "[replacetext(design, "-", "")]corner"
 			tile_dir_mode = 2
@@ -128,11 +128,13 @@
 			if(design == "white")
 				mode = "whitehall"
 				mode_nice = "white side"
-				tile_dir_mode = 1
+			else if(design == "black") // because SOMEONE made the black/grey side/corner sprite have the same name as the 'empty space' sprite :(
+				mode = "blackfloor"
+				mode_nice = design
 			else
 				mode_nice = design
 				mode = replacetext(design, "-", "")
-				tile_dir_mode = 1
+			tile_dir_mode = 1
 		if("special")
 			var/design = input("Which design?", "Floor painter") in list("arrival", "escape", "caution", "warning", "white-warning", "white-blue-green", "loadingarea", "delivery", "bot", "white-delivery", "white-bot")
 			if(design == "white-blue-green")

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

@@ -71,8 +71,8 @@
 		Emag()
 		return
 
-	if(istype(W, /obj/item/stack/sheet/glass))
-		var/obj/item/stack/sheet/glass/G = W
+	if(istype(W, /obj/item/stack/material/glass))
+		var/obj/item/stack/material/glass/G = W
 		if(uses >= max_uses)
 			user << "<span class='warning'>[src.name] is full."
 			return

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

@@ -27,6 +27,7 @@
 
 /obj/item/device/powersink/Destroy()
 	processing_objects.Remove(src)
+	processing_power_items.Remove(src)
 	..()
 
 /obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user)
@@ -49,6 +50,7 @@
 		else
 			if (mode == 2)
 				processing_objects.Remove(src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite
+				processing_power_items.Remove(src)
 			anchored = 0
 			mode = 0
 			src.visible_message("<span class='notice'>[user] detaches [src] from the cable!</span>")
@@ -71,25 +73,27 @@
 			mode = 2
 			icon_state = "powersink1"
 			processing_objects.Add(src)
+			processing_power_items.Add(src)
 		if(2)  //This switch option wasn't originally included. It exists now. --NeoFite
 			src.visible_message("<span class='notice'>[user] deactivates [src]!</span>")
 			mode = 1
 			set_light(0)
 			icon_state = "powersink0"
 			processing_objects.Remove(src)
+			processing_power_items.Remove(src)
 
-/obj/item/device/powersink/proc/drain()
+/obj/item/device/powersink/pwr_drain()
 	if(!attached)
-		return
+		return 0
 
 	if(drained_this_tick)
-		return
+		return 1
 	drained_this_tick = 1
 
 	var/drained = 0
 
 	if(!PN)
-		return
+		return 1
 
 	set_light(12)
 	PN.trigger_warning()
@@ -110,6 +114,7 @@
 					A.cell.use(drain_val * CELLRATE)
 					drained += drain_val
 	power_drained += drained
+	return 1
 
 
 /obj/item/device/powersink/process()

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

@@ -212,6 +212,13 @@
 	freerange = 1
 	ks2type = /obj/item/device/encryptionkey/ert
 
+/obj/item/device/radio/headset/ia
+	name = "internal affair's headset"
+	desc = "The headset of your worst enemy."
+	icon_state = "com_headset"
+	item_state = "headset"
+	ks2type = /obj/item/device/encryptionkey/heads/hos
+
 /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob)
 //	..()
 	user.set_machine(src)

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

@@ -211,6 +211,9 @@
 
 	M.last_target_radio = world.time // For the projectile targeting system
 
+	if(!radio_connection)
+		set_frequency(frequency)
+
 	/* Quick introduction:
 		This new radio system uses a very robust FTL signaling technology unoriginally
 		dubbed "subspace" which is somewhat similar to 'blue-space' but can't

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

@@ -192,10 +192,12 @@ REAGENT SCANNER
 
 		for(var/name in H.organs_by_name)
 			var/obj/item/organ/external/e = H.organs_by_name[name]
-			if(e.status & ORGAN_BROKEN)
+			if(e && e.status & ORGAN_BROKEN)
 				user.show_message(text("\red Bone fractures detected. Advanced scanner required for location."), 1)
 				break
 		for(var/obj/item/organ/external/e in H.organs)
+			if(!e)
+				continue
 			for(var/datum/wound/W in e.wounds) if(W.internal)
 				user.show_message(text("\red Internal bleeding detected. Advanced scanner required for location."), 1)
 				break