Merge pull request #5293 from MistakeNot4892/dev

Pulling splint fix into dev.

Author: MistakeNot4892

code/game/objects/items/weapons/material/stick.dm

@@ -27,7 +27,7 @@
 	if(!sharp && (istype(used_item, /obj/item/stack/material/bolt) || istype(used_item, /obj/item/stack/material/bundle)))
 
 		var/choice = input(user, "Do you want to make a torch, or a splint?", "Stick Crafting") as null|anything in list("Torch", "Splint")
-		if(!choice || QDELETED(user) || user.get_active_held_item() != used_item || QDELETED(used_item) || !QDELETED(src) || (loc != user && !Adjacent(user)) || sharp)
+		if(!choice || QDELETED(user) || user.get_active_held_item() != used_item || QDELETED(used_item) || QDELETED(src) || (loc != user && !Adjacent(user)) || sharp)
 			return TRUE
 
 		var/obj/item/stack/material/cloth = used_item
@@ -54,7 +54,11 @@
 		var/was_held = (loc == user)
 		cloth.use(cloth_cost)
 		if(!was_held || user.try_unequip(src))
-			var/obj/item/thing = new product_type(get_turf(src), material?.type, used_item.material?.type)
+			var/obj/item/thing
+			if(ispath(product_type, /obj/item/stack))
+				thing = new product_type(get_turf(src), 1, material?.type, used_item.material?.type)
+			else
+				thing = new product_type(get_turf(src), material?.type, used_item.material?.type)
 			if(was_held)
 				user.put_in_hands(thing)
 			to_chat(user, SPAN_NOTICE("You fashion \the [src] into \a [thing]."))

maps/shaded_hills/shaded_hills_testing.dm

@@ -1,5 +1,4 @@
-/datum/map/shaded_hills
-	apc_test_exempt_areas = list(
-		/area/space        = NO_SCRUBBER|NO_VENT|NO_APC,
-		/area/shaded_hills = NO_SCRUBBER|NO_VENT|NO_APC
-	)
+/datum/map/shaded_hills/New()
+	LAZYDISTINCTADD(area_coherency_test_exempted_root_areas, /area/shaded_hills/outside)
+	LAZYSET(apc_test_exempt_areas, /area/shaded_hills, (NO_SCRUBBER|NO_VENT|NO_APC))
+	..()