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

Conflicts:
	code/game/machinery/vending.dm

code/game/machinery/atmo_control.dm

@@ -182,7 +182,7 @@
 
 	else
 		output += "<FONT color='red'>ERROR: Can not find input port</FONT> <A href='?src=\ref[src];in_refresh_status=1'>Search</A><BR>"
-	
+
 	output += "Flow Rate Limit: <A href='?src=\ref[src];adj_input_flow_rate=-100'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-10'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-1'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-0.1'>-</A> [round(input_flow_setting, 0.1)] L/s <A href='?src=\ref[src];adj_input_flow_rate=0.1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=10'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=100'>+</A><BR>"
 
 	output += "<BR>"
@@ -230,7 +230,7 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 		spawn(1)
 			src.updateUsrDialog()
 		return 1
-	
+
 	if(!radio_connection)
 		return 0
 	var/datum/signal/signal = new
@@ -239,32 +239,32 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 	if(href_list["in_refresh_status"])
 		input_info = null
 		signal.data = list ("tag" = input_tag, "status" = 1)
-		return 1
+		. = 1
 
 	if(href_list["in_toggle_injector"])
 		input_info = null
 		signal.data = list ("tag" = input_tag, "power_toggle" = 1)
-		return 1
+		. = 1
 
 	if(href_list["in_set_flowrate"])
 		input_info = null
 		signal.data = list ("tag" = input_tag, "set_volume_rate" = "[input_flow_setting]")
-		return 1
+		. = 1
 
 	if(href_list["out_refresh_status"])
 		output_info = null
 		signal.data = list ("tag" = output_tag, "status" = 1)
-		return 1
+		. = 1
 
 	if(href_list["out_toggle_power"])
 		output_info = null
 		signal.data = list ("tag" = output_tag, "power_toggle" = 1)
-		return 1
+		. = 1
 
 	if(href_list["out_set_pressure"])
 		output_info = null
 		signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[pressure_setting]")
-		return 1
+		. = 1
 
 	signal.data["sigtype"]="command"
 	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
@@ -302,7 +302,7 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 
 	else
 		output += "<FONT color='red'>ERROR: Can not find input port</FONT> <A href='?src=\ref[src];in_refresh_status=1'>Search</A><BR>"
-	
+
 	output += "Flow Rate Limit: <A href='?src=\ref[src];adj_input_flow_rate=-100'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-10'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-1'>-</A> <A href='?src=\ref[src];adj_input_flow_rate=-0.1'>-</A> [round(input_flow_setting, 0.1)] L/s <A href='?src=\ref[src];adj_input_flow_rate=0.1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=1'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=10'>+</A> <A href='?src=\ref[src];adj_input_flow_rate=100'>+</A><BR>"
 
 	output += "<BR>"
@@ -350,7 +350,7 @@ Min Core Pressure: [pressure_limit] kPa<BR>"}
 		spawn(1)
 			src.updateUsrDialog()
 		return 1
-	
+
 	if(!radio_connection)
 		return 0
 	var/datum/signal/signal = new
@@ -359,32 +359,32 @@ Min Core Pressure: [pressure_limit] kPa<BR>"}
 	if(href_list["in_refresh_status"])
 		input_info = null
 		signal.data = list ("tag" = input_tag, "status" = 1)
-		return 1
+		. = 1
 
 	if(href_list["in_toggle_injector"])
 		input_info = null
 		signal.data = list ("tag" = input_tag, "power_toggle" = 1)
-		return 1
+		. = 1
 
 	if(href_list["in_set_flowrate"])
 		input_info = null
 		signal.data = list ("tag" = input_tag, "set_volume_rate" = "[input_flow_setting]")
-		return 1
+		. = 1
 
 	if(href_list["out_refresh_status"])
 		output_info = null
 		signal.data = list ("tag" = output_tag, "status" = 1)
-		return 1
+		. = 1
 
 	if(href_list["out_toggle_power"])
 		output_info = null
 		signal.data = list ("tag" = output_tag, "power_toggle" = 1)
-		return 1
+		. = 1
 
 	if(href_list["out_set_pressure"])
 		output_info = null
 		signal.data = list ("tag" = output_tag, "set_external_pressure" = "[pressure_setting]", "checks" = 1)
-		return 1
+		. = 1
 
 	signal.data["sigtype"]="command"
 	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)

code/game/machinery/computer/communications.dm

@@ -437,7 +437,7 @@
 		return
 
 	if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE
-		user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/60)] minutes before trying again."
+		user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minute\s before trying again."
 		return
 
 	if(emergency_shuttle.going_to_centcom())

code/game/machinery/vending.dm

@@ -947,7 +947,7 @@
 	desc = "Spare tool vending. What? Did you expect some witty description?"
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
-	req_access = list(access_engine_equip) //Engineering Equipment access
+	req_access = list(access_engine_equip)
 	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/cell/high = 10)
 	contraband = list(/obj/item/weapon/cell/potato = 3)
 	premium = list(/obj/item/weapon/storage/belt/utility = 3)

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

@@ -825,7 +825,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
 							difficulty += P.cartridge.access_engine
 							difficulty += P.cartridge.access_clown
 							difficulty += P.cartridge.access_janitor
-							difficulty += 3 * P.hidden_uplink
+							if(P.hidden_uplink)
+								difficulty += 3
 
 						if(prob(difficulty))
 							U.show_message("\red An error flashes on your [src].", 1)

code/game/objects/items/stacks/sheets/glass.dm

@@ -161,6 +161,7 @@
 	singular_name = "reinforced glass sheet"
 	icon_state = "sheet-rglass"
 	charge_costs = list(500, 1000)
+	stacktype = /obj/item/stack/sheet/glass/reinforced
 
 /*
  * Phoron Glass sheets

code/game/objects/structures/girders.dm

@@ -113,7 +113,7 @@
 							del(src)
 					return
 
-			if(/obj/item/stack/sheet/plasteel)
+			if(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/plasteel/cyborg)
 				if(!anchored)
 					if(S.use(2))
 						user << "\blue You create a false wall! Push on it to open or close the passage."

code/modules/clothing/spacesuits/rig/rig.dm

@@ -631,8 +631,9 @@
 						use_obj.loc = src
 
 		else if (deploy_mode != ONLY_RETRACT)
-			if(check_slot && check_slot != use_obj)
+			if(check_slot)
-				H << "<span class='danger'>You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.</span>"
+				if(check_slot != use_obj)
+					H << "<span class='danger'>You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.</span>"
 				return
 			else
 				use_obj.loc = H

code/modules/mob/living/silicon/robot/life.dm

@@ -130,10 +130,11 @@
 	if (src.stat != 0)
 		uneq_all()
 
-	if(!is_component_functioning("radio"))
+	if(radio)
-		radio.on = 0
+		if(!is_component_functioning("radio"))
-	else
+			radio.on = 0
-		radio.on = 1
+		else
+			radio.on = 1
 
 	if(is_component_functioning("camera"))
 		src.blinded = 0

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -191,7 +191,7 @@
 	src.modules += R
 
 	var/obj/item/stack/sheet/plasteel/cyborg/S = new /obj/item/stack/sheet/plasteel/cyborg(src)
-	S.synths = list(metal)
+	S.synths = list(plasteel)
 	src.modules += S
 
 	var/obj/item/stack/sheet/glass/reinforced/cyborg/RG = new /obj/item/stack/sheet/glass/reinforced/cyborg(src)

code/modules/power/port_gen.dm

@@ -342,6 +342,7 @@
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
 		ui = new(user, src, ui_key, "pacman.tmpl", src.name, 500, 560)
+		ui.set_initial_data(data)
 		ui.open()
 		ui.set_auto_update(1)
 

code/modules/reagents/Chemistry-Recipes.dm

@@ -213,13 +213,6 @@ datum
 			required_catalysts = list("phoron" = 5)
 			result_amount = 2
 
-		virus_food
-			name = "Virus Food"
-			id = "virusfood"
-			result = "virusfood"
-			required_reagents = list("water" = 1, "milk" = 1)
-			result_amount = 5
-
 		leporazine
 			name = "Leporazine"
 			id = "leporazine"
@@ -538,8 +531,8 @@ datum
 			name = "Virus Food"
 			id = "virusfood"
 			result = "virusfood"
-			required_reagents = list("water" = 5, "milk" = 5, "oxygen" = 5)
+			required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1)
-			result_amount = 15
+			result_amount = 3
 /*
 		mix_virus
 			name = "Mix Virus"
@@ -1629,7 +1622,9 @@ datum
 			required_reagents = list("egg" = 3, "flour" = 10)
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
-				new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(holder.my_atom))
+				var/turf/T = get_turf(holder.my_atom)
+				for(var/i = 1 to created_volume)
+					new /obj/item/weapon/reagent_containers/food/snacks/dough(T)
 				return
 
 		syntiflesh
@@ -1639,8 +1634,9 @@ datum
 			required_reagents = list("blood" = 5, "clonexadone" = 1)
 			result_amount = 1
 			on_reaction(var/datum/reagents/holder, var/created_volume)
-				var/location = get_turf(holder.my_atom)
+				var/turf/T = get_turf(holder.my_atom)
-				new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
+				for(var/i = 1 to created_volume)
+					new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(T)
 				return
 
 		hot_ramen