Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul

code/modules/hydroponics/gene_modder.dm

@@ -430,7 +430,7 @@
 	src.pixel_x = rand(-5, 5)
 	src.pixel_y = rand(-5, 5)
 
-/obj/item/disk/plantgene/proc/update_name()
+/obj/item/disk/plantgene/update_name()
 	if(gene)
 		name = "[gene.get_name()] (plant data disk)"
 	else

code/modules/hydroponics/grown/root.dm

@@ -29,7 +29,7 @@
 /obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params)
 	if(I.get_sharpness())
 		to_chat(user, "<span class='notice'>You sharpen the carrot into a shiv with [I].</span>")
-		var/obj/item/kitchen/knife/carrotshiv/Shiv = new /obj/item/kitchen/knife/carrotshiv
+		var/obj/item/kitchen/knife/shiv/carrot/Shiv = new /obj/item/kitchen/knife/shiv/carrot
 		remove_item_from_storage(user)
 		qdel(src)
 		user.put_in_hands(Shiv)

code/modules/hydroponics/grown/towercap.dm

@@ -226,7 +226,7 @@
 		var/turf/open/O = loc
 		if(O.air)
 			var/datum/gas_mixture/loc_air = O.air
-			if(loc_air.get_moles(GAS_O2) > 13)
+			if(loc_air.get_moles(GAS_O2) > 3)
 				return TRUE
 	return FALSE