Updating from Neb dev.

code/game/machinery/biogenerator.dm

@@ -128,7 +128,7 @@
 	user.set_machine(src)
 	var/list/data = list()
 	data["state"] = state
-	var/name
+	var/product_name
 	var/cost
 	var/type_name
 	var/path
@@ -141,12 +141,11 @@
 			var/list/listed_products = list()
 			for(var/c_product =1 to current_content.len)
 				path = current_content[c_product]
-				var/atom/A = path
-				name = initial(A.name)
+				product_name = atom_info_repository.get_name_for(path)
 				cost = current_content[path]
 				listed_products.Add(list(list(
 					"product_index" = c_product,
-					"name" = name,
+					"name" = product_name,
 					"cost" = cost)))
 			listed_types.Add(list(list(
 				"type_name" = type_name,

code/game/objects/structures/flora/plant.dm

@@ -71,7 +71,7 @@
 	. = ..()
 	icon_state = "blank"
 	color = null
-	set_overlays(plant.get_appearance(dead = dead, growth_stage = growth_stage, can_harvest = length(harvestable)))
+	set_overlays(plant.get_appearance(dead = dead, growth_stage = growth_stage, can_harvest = !!harvestable))
 
 /obj/structure/flora/plant/attackby(obj/item/O, mob/user)
 

code/game/turfs/floors/natural/natural_barren.dm

@@ -5,6 +5,9 @@
 	is_fundament_turf = TRUE
 	material = /decl/material/solid/sand
 
+/turf/floor/natural/barren/airless
+	initial_gas = null
+
 /turf/floor/natural/barren/Initialize()
 	if(prob(20))
 		LAZYADD(decals, image('icons/turf/flooring/decals.dmi', "asteroid[rand(0,9)]"))

code/game/world.dm

@@ -128,6 +128,13 @@ var/global/world_topic_last = world.timeofday
 	return TC.try_use(T, addr, master, key)
 
 /world/Reboot(var/reason)
+
+	if(get_config_value(/decl/config/toggle/wait_for_sigusr1_reboot) && reason != 3)
+		text2file("foo", "reboot_called")
+		to_world("<span class=danger>World reboot waiting for external scripts. Please be patient.</span>")
+		global.Master.restart_timeout = 5 MINUTES
+		return
+
 	if(global.using_map.reboot_sound)
 		sound_to(world, sound(pick(global.using_map.reboot_sound)))// random end sounds!! - LastyBatsy
 
@@ -138,11 +145,6 @@ var/global/world_topic_last = world.timeofday
 		for(var/client/C in global.clients)
 			to_chat(C, link("byond://[serverurl]"))
 
-	if(get_config_value(/decl/config/toggle/wait_for_sigusr1_reboot) && reason != 3)
-		text2file("foo", "reboot_called")
-		to_world("<span class=danger>World reboot waiting for external scripts. Please be patient.</span>")
-		return
-
 	game_log("World rebooted at [time_stamp()]")
 
 	callHook("reboot")

code/modules/hydroponics/seed_appearance.dm

@@ -16,18 +16,19 @@
 		if(SSplants.plant_icon_cache[ikey])
 			dead_overlay = SSplants.plant_icon_cache[ikey]
 		else
-			dead_overlay = image('icons/obj/hydroponics/hydroponics_growing.dmi', "[ikey]")
+			dead_overlay = image('icons/obj/hydroponics/hydroponics_growing.dmi', ikey)
 			dead_overlay.color = DEAD_PLANT_COLOUR
 			SSplants.plant_icon_cache[ikey] = dead_overlay
 	return dead_overlay
 
 /datum/seed/proc/get_harvest_appearance()
 	if(!harvest_overlay)
-		var/ikey = "product-[get_trait(TRAIT_PRODUCT_ICON)]-[get_trait(TRAIT_PLANT_COLOUR)]"
+		var/icon_state = get_trait(TRAIT_PRODUCT_ICON)
+		var/ikey = "product-[icon_state]-[get_trait(TRAIT_PLANT_COLOUR)]"
 		if(SSplants.plant_icon_cache[ikey])
 			harvest_overlay = SSplants.plant_icon_cache[ikey]
 		else
-			harvest_overlay = image('icons/obj/hydroponics/hydroponics_products.dmi', "[ikey]")
+			harvest_overlay = image('icons/obj/hydroponics/hydroponics_products.dmi', icon_state)
 			harvest_overlay.color = get_trait(TRAIT_PRODUCT_COLOUR)
 			SSplants.plant_icon_cache[ikey] = harvest_overlay
 	return harvest_overlay

code/modules/mob/living/living.dm

@@ -1514,7 +1514,6 @@ default behaviour is:
 /mob/living/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, datum/callback/callback) //If this returns FALSE then callback will not be called.
 	return !length(pinned) && ..()
 
-
 /mob/living/remove_implant(obj/item/implant, surgical_removal = FALSE, obj/item/organ/external/affected)
 
 	LAZYREMOVE(embedded, implant)

maps/ministation/ministation_objects.dm

@@ -1,5 +1,6 @@
 /turf/wall/natural/random/ministation
 	initial_gas = null
+	floor_type = /turf/floor/natural/barren/airless
 
 /turf/wall/natural/random/ministation/get_weighted_mineral_list()
 	if(prob(80))