Merge pull request #4806 from MistakeNot4892/fork/pyrelight

Various changes from Pyrelight.
NebulaSS13 · Jan 25, 2025 · a6f2110 · a6f2110
2 parents 471587d + f6c8709
commit a6f2110
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/code/game/turfs/floors/subtypes/floor_natural.dm b/code/game/turfs/floors/subtypes/floor_natural.dm
@@ -100,6 +100,13 @@
 	color = "#ae9e66"
 	_flooring = /decl/flooring/sand
 
+/turf/floor/rock/basalt/sand
+	name = "sand"
+	icon = 'icons/turf/flooring/sand.dmi'
+	icon_state = "sand0"
+	color = "#ae9e66"
+	_flooring = /decl/flooring/sand
+
 /turf/floor/rock/sand/water
 	color = COLOR_SKY_BLUE
 	fill_reagent_type = /decl/material/liquid/water

diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
@@ -54,8 +54,8 @@
 	// get overridden almost immediately.
 
 	// TL;DR: just leave these vars alone.
+	var/is_outside = OUTSIDE_AREA // non-tmp to allow visibility in mapper.
 	var/tmp/obj/abstract/weather_system/weather
-	var/tmp/is_outside = OUTSIDE_AREA
 	var/tmp/last_outside_check = OUTSIDE_UNCERTAIN
 
 	///The cached air mixture of a turf. Never directly access, use `return_air()`.

diff --git a/code/unit_tests/icon_tests.dm b/code/unit_tests/icon_tests.dm
@@ -12,11 +12,14 @@
 	// We skip lumps because they are invisible, they are only ever inside utensils.
 	var/list/skip_types = list(/obj/item/food/lump)
 
-/datum/unit_test/icon_test/food_shall_have_icon_states/start_test()
-
+/datum/unit_test/icon_test/food_shall_have_icon_states/proc/assemble_skipped_types()
 	skip_types |= typesof(/obj/item/food/grown)
 	skip_types |= typesof(/obj/item/food/processed_grown)
 
+/datum/unit_test/icon_test/food_shall_have_icon_states/start_test()
+
+	assemble_skipped_types()
+
 	var/list/failures = list()
 	for(var/check_type in check_types)
 		for(var/check_subtype in typesof(check_type))

diff --git a/maps/shaded_hills/shaded_hills-dungeon.dmm b/maps/shaded_hills/shaded_hills-dungeon.dmm
@@ -466,8 +466,6 @@
 /area/shaded_hills/caves/dungeon/poi)
 "GA" = (
 /obj/structure/door/ebony,
-/obj/structure/door/ebony,
-/obj/structure/door/ebony,
 /obj/abstract/landmark/lock_preset{
 	lock_preset_id = "sunken keep";
 	name = "sunken keep locked door"