Merge branch 'fake-master' into development

# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -154,7 +154,7 @@
 	display_name = "toe-less jackboots"
 	path = /obj/item/clothing/shoes/jackboots/unathi
 	sort_category = "Xenowear"
-	whitelisted = list("Vaurca Worker", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
+	whitelisted = list("Vaurca Worker", "Vaurca Warrior", "Unathi", "Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
 
 /datum/gear/shoes/workboots_toeless
 	display_name = "toeless workboots"

code/modules/events/ccia_general_notice.dm

@@ -19,4 +19,4 @@
 
 /datum/event/ccia_general_notice/announce()
 	if(announce)
-		command_announcement.Announce("[reportbody]", reporttitle, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
+		command_announcement.Announce("[reportbody]", reporttitle, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1, do_newscast=1, do_print=1);

code/modules/mining/machine_stacking.dm

@@ -22,45 +22,51 @@
 
 /obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
 	add_fingerprint(user)
-	interact(user)
+	ui_interact(user)
 
-/obj/machinery/mineral/stacking_unit_console/interact(mob/user)
-	user.set_machine(src)
-
-	var/dat
-
-	dat += text("<h1>Stacking unit console</h1><hr><table>")
-
-	for(var/stacktype in machine.stack_storage)
-		if(machine.stack_storage[stacktype] > 0)
-			dat += "<tr><td width = 150><b>[capitalize(stacktype)]:</b></td><td width = 30>[machine.stack_storage[stacktype]]</td><td width = 50><A href='?src=\ref[src];release_stack=[stacktype]'>\[release\]</a></td></tr>"
-	dat += "</table><hr>"
-	dat += text("<br>Stacking: [machine.stack_amt] <A href='?src=\ref[src];change_stack=1'>\[change\]</a><br><br>")
-
-	user << browse("[dat]", "window=console_stacking_machine")
-	onclose(user, "console_stacking_machine")
+/obj/machinery/mineral/stacking_unit_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/topic_state/state = default_state)
+	var/list/data = list(
+		"stack_amt" = machine.stack_amt,
+		"contents" = list()
+	)
+	for (var/stacktype in machine.stack_storage)
+		if (machine.stack_storage[stacktype] > 0)
+			data["contents"] += list(list(
+				"path" = stacktype,
+				"name" = machine.stack_paths[stacktype],
+				"amount" = machine.stack_storage[stacktype]
+			))
 
+	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "stacking_machine.tmpl", "Stacking Machine", 500, 400, state = state)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
 
 /obj/machinery/mineral/stacking_unit_console/Topic(href, href_list)
 	if(..())
-		return 1
+		return
 
 	if(href_list["change_stack"])
 		var/choice = input("What would you like to set the stack amount to?") as null|anything in list(1,5,10,20,50)
-		if(!choice) return
+		if(!choice)
+			return TRUE
 		machine.stack_amt = choice
+		return TRUE
 
 	if(href_list["release_stack"])
-		if(machine.stack_storage[href_list["release_stack"]] > 0)
-			var/stacktype = machine.stack_paths[href_list["release_stack"]]
-			var/obj/item/stack/material/S = new stacktype (get_turf(machine.output))
-			S.amount = machine.stack_storage[href_list["release_stack"]]
-			machine.stack_storage[href_list["release_stack"]] = 0
+		var/stacktype = text2path(href_list["release_stack"])
+		if (!stacktype || !machine.stack_paths[stacktype])
+			return
 
-	src.add_fingerprint(usr)
-	src.updateUsrDialog()
+		if(machine.stack_storage[stacktype] > 0)
+			var/obj/item/stack/material/S = new stacktype(get_turf(machine.output))
+			S.amount = machine.stack_storage[stacktype]
+			machine.stack_storage[stacktype] = 0
+			return TRUE
 
-	return
+	add_fingerprint(usr)
 
 /**********************Mineral stacking unit**************************/
 
@@ -74,8 +80,8 @@
 	var/obj/machinery/mineral/stacking_unit_console/console
 	var/obj/machinery/mineral/input = null
 	var/obj/machinery/mineral/output = null
-	var/list/stack_storage[0]
-	var/list/stack_paths[0]
+	var/list/stack_storage = list()
+	var/list/stack_paths = list()
 	var/stack_amt = 50; // Amount to stack before releassing
 	use_power = 1
 	idle_power_usage = 15
@@ -84,25 +90,20 @@
 /obj/machinery/mineral/stacking_machine/Initialize()
 	. = ..()
 
-	for(var/stacktype in typesof(/obj/item/stack/material)-/obj/item/stack/material)
-		var/obj/item/stack/S = new stacktype(src)
-		stack_storage[S.name] = 0
-		stack_paths[S.name] = stacktype
-		qdel(S)
-
-	stack_storage["glass"] = 0
-	stack_paths["glass"] = /obj/item/stack/material/glass
-	stack_storage[DEFAULT_WALL_MATERIAL] = 0
-	stack_paths[DEFAULT_WALL_MATERIAL] = /obj/item/stack/material/steel
-	stack_storage["plasteel"] = 0
-	stack_paths["plasteel"] = /obj/item/stack/material/plasteel
+	for(var/stacktype in subtypesof(/obj/item/stack/material) - typesof(/obj/item/stack/material/cyborg))
+		var/obj/item/stack/S = stacktype
+		stack_storage[stacktype] = 0
+		stack_paths[stacktype] = capitalize(initial(S.name))
 
 	for (var/dir in cardinal)
-		src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
-		if(src.input) break
+		input = locate(/obj/machinery/mineral/input, get_step(src, dir))
+		if(input)
+			break
+
 	for (var/dir in cardinal)
-		src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
-		if(src.output) break
+		output = locate(/obj/machinery/mineral/output, get_step(src, dir))
+		if(output)
+			break
 
 /obj/machinery/mineral/stacking_machine/machinery_process()
 	..()
@@ -110,27 +111,19 @@
 		log_debug("Stacking machine tried to process, but no console has linked itself to it.")
 		qdel(src)
 		return
-	if (src.output && src.input)
+
+	if (output && input)
 		var/turf/T = get_turf(input)
-		for(var/obj/item/O in T.contents)
+		for(var/obj/item/O in T)
 			if(!O) return
-			if(istype(O,/obj/item/stack))
-				if(!isnull(stack_storage[O.name]))
-					stack_storage[O.name]++
-					O.loc = null
-				else
-					O.loc = output.loc
+			if(istype(O, /obj/item/stack) && stack_storage[O.type] != null)
+				stack_storage[O.type]++
+				qdel(O)
 			else
-				O.loc = output.loc
+				O.forceMove(output.loc)
 
 	//Output amounts that are past stack_amt.
 	for(var/sheet in stack_storage)
 		if(stack_storage[sheet] >= stack_amt)
-			var/stacktype = stack_paths[sheet]
-			var/obj/item/stack/material/S = new stacktype (get_turf(output))
-			S.amount = stack_amt
+			new sheet(get_turf(output), stack_amt)
 			stack_storage[sheet] -= stack_amt
-
-	console.updateUsrDialog()
-	return
-

code/modules/mob/living/autohiss.dm

@@ -61,7 +61,8 @@
 	autohiss_exempt = list(
 			LANGUAGE_SIIK_MAAS,
 			LANGUAGE_SIIK_TAJR,
-			LANGUAGE_SIGN_TAJARA
+			LANGUAGE_SIGN_TAJARA,
+			LANGUAGE_YA_SSA
 		)
 
 /datum/species/bug

code/modules/mob/living/carbon/human/update_icons.dm

@@ -254,6 +254,8 @@ There are several things that need to be remembered:
 		base_icon = chest.get_icon()
 
 		for(var/obj/item/organ/external/part in organs)
+			if(isnull(part) || part.is_stump())
+				continue
 			var/icon/temp = part.get_icon(skeleton)//The color comes from this function
 			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
 			//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -58,7 +58,7 @@
 				plastic.add_charge(1000)
 
 
-		else if(istype(M,/mob/living/simple_animal/lizard) || istype(M,/mob/living/simple_animal/mouse))
+		else if(istype(M,/mob/living/simple_animal/lizard) || (istype(M,/mob/living/simple_animal/mouse) && M.mob_size <= 2))
 			src.loc.visible_message("<span class='danger'>[src.loc] sucks [M] into its decompiler. There's a horrible crunching noise.</span>","<span class='danger'>It's a bit of a struggle, but you manage to suck [M] into your decompiler. It makes a series of visceral crunching noises.</span>")
 			new/obj/effect/decal/cleanable/blood/splatter(get_turf(src))
 			qdel(M)

code/modules/power/tesla/coil.dm

@@ -23,7 +23,8 @@
 /obj/machinery/power/tesla_coil/attackby(obj/item/W, mob/user)
 	if(default_deconstruction_screwdriver(user, W))
 		return
-
+	if(default_deconstruction_crowbar(user, W))
+		return
 	if(default_part_replacement(user, W))
 		return
 
@@ -37,8 +38,6 @@
 			connect_to_network()
 		return
 
-	default_deconstruction_crowbar(user, W)
-
 /obj/machinery/power/tesla_coil/tesla_act(var/power)
 	if(anchored)
 		being_shocked = 1
@@ -62,14 +61,16 @@
 	density = 1
 
 	component_types = list(
-		///obj/item/weapon/circuitboard/grounding_rod,
+		/obj/item/weapon/circuitboard/grounding_rod,
 		/obj/item/weapon/stock_parts/capacitor
 	)
 
+
 /obj/machinery/power/grounding_rod/attackby(obj/item/W, mob/user)
 	if(default_deconstruction_screwdriver(user, W))
 		return
-
+	if(default_deconstruction_crowbar(user, W))
+		return
 	if(default_part_replacement(user, W))
 		return
 
@@ -79,7 +80,6 @@
 		anchored = !anchored
 		return
 
-	default_deconstruction_crowbar(user, W)
 
 /obj/machinery/power/grounding_rod/tesla_act(var/power)
 	flick("coil_shock_1", src)
@@ -87,5 +87,15 @@
 /obj/item/weapon/circuitboard/tesla_coil
 	name = "tesla coil circuitry"
 	desc = "The circuitboard for a tesla coil."
+	build_path = "/obj/machinery/power/tesla_coil"
 	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
 	req_components = list("/obj/item/weapon/stock_parts/capacitor" = 1)
+	board_type = "machine"
+
+/obj/item/weapon/circuitboard/grounding_rod
+	name = "grounding rod circuitry"
+	desc = "The circuitboard for a grounding rod."
+	build_path = "/obj/machinery/power/grounding_rod"
+	origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
+	req_components = list("/obj/item/weapon/stock_parts/capacitor" = 1)
+	board_type = "machine"