From 7f356a83a284bc7ec1c75d95d923e47ab77d8708 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:23:53 +1100 Subject: [PATCH 1/4] Removing extraneous doors. --- maps/shaded_hills/shaded_hills-dungeon.dmm | 2 -- 1 file changed, 2 deletions(-) diff --git a/maps/shaded_hills/shaded_hills-dungeon.dmm b/maps/shaded_hills/shaded_hills-dungeon.dmm index dc6ee7b450e..6d1ab918e6f 100644 --- 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" From 9b9d395a743fd5b9c94dc770352851a9ab155a54 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:24:09 +1100 Subject: [PATCH 2/4] Allowing outside status of turfs to be seen in the mapper. --- code/game/turfs/turf.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 11c0740d79a..87ca2918d54 100644 --- 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()`. From b57c10bf70e2e0f761b2913e1004f94dbc5aaf02 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:24:22 +1100 Subject: [PATCH 3/4] Adding a basalt floor with sand turf type. --- code/game/turfs/floors/subtypes/floor_natural.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/turfs/floors/subtypes/floor_natural.dm b/code/game/turfs/floors/subtypes/floor_natural.dm index 09fbbcc07d2..5851afd8ab9 100644 --- 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 From f6c87098d450bd664ac9ebb30f77f8f3c0df0d6a Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:24:33 +1100 Subject: [PATCH 4/4] Allowing downstreams to override skipped food types in CI test. --- code/unit_tests/icon_tests.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/unit_tests/icon_tests.dm b/code/unit_tests/icon_tests.dm index 8ab79c314a2..279daba8a34 100644 --- 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))