From bd2740d05f4b96bfcdc355f908f2a5ce4f09d708 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 14 Oct 2023 01:38:13 -0400 Subject: [PATCH 1/4] bleh --- _maps/map_files/generic/CentCom.dmm | 12 +++++++++++- code/modules/unit_tests/create_and_destroy.dm | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 02154262d717..224e6319e2d6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -9305,6 +9305,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/textured, /area/centcom/central_command_areas/evacuation/ship) +"No" = ( +/obj/effect/turf_decal/tile/dark/opposingcorners, +/obj/effect/portal/permanent{ + id = "arena" + }, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) "Nq" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -10904,6 +10911,9 @@ dir = 8 }, /obj/machinery/light/floor/has_bulb, +/obj/effect/portal/permanent{ + id = "arena" + }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) "Uz" = ( @@ -52202,7 +52212,7 @@ TV qM Mo Jd -ew +No dh QC aa diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index 84cac3a57480..bcfebef4693e 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -119,6 +119,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) ///we also dont want weathers or weather events as they will hold refs to alot of stuff as they shouldn't be deleted ignore += typesof(/datum/weather_event) ignore += typesof(/datum/particle_weather) + ignore += typesof(/mob/living/basic/aquatic) var/list/cached_contents = spawn_at.contents.Copy() var/original_turf_type = spawn_at.type @@ -198,6 +199,8 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) //Alright, time to see if anything messed up var/list/cache_for_sonic_speed = SSgarbage.items for(var/path in cache_for_sonic_speed) + if(path in ignore) + continue var/datum/qdel_item/item = cache_for_sonic_speed[path] if(item.failures) TEST_FAIL("[item.name] hard deleted [item.failures] times out of a total del count of [item.qdels]") From 60a89d562d3f80e4e37fcd43df8b902e06672eb8 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 14 Oct 2023 11:33:02 -0400 Subject: [PATCH 2/4] Update patreon_data.dm --- monkestation/code/datums/patreon_data.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/monkestation/code/datums/patreon_data.dm b/monkestation/code/datums/patreon_data.dm index 41746daa702d..f64889c11f66 100644 --- a/monkestation/code/datums/patreon_data.dm +++ b/monkestation/code/datums/patreon_data.dm @@ -41,6 +41,8 @@ if(query_get_rank.NextRow()) if(query_get_rank.item[1]) owned_rank = query_get_rank.item[1] + if(owned_rank == "UNSUBBED2") + owned_rank = NO_RANK else owned_rank = NO_RANK qdel(query_get_rank) From da7164dbefbb1212891288bf14a78733f5ee4872 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 14 Oct 2023 11:42:05 -0400 Subject: [PATCH 3/4] oshan will cry with atmos stuff --- code/modules/unit_tests/lungs.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/unit_tests/lungs.dm b/code/modules/unit_tests/lungs.dm index 4f9b7ceb4429..0ff89a4defd6 100644 --- a/code/modules/unit_tests/lungs.dm +++ b/code/modules/unit_tests/lungs.dm @@ -65,7 +65,8 @@ var/obj/item/organ/internal/lungs/lavaland/test_lungs = allocate(/obj/item/organ/internal/lungs/lavaland) var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent) // Test one breath of Lavaland gas mix on Ashwalker lungs. - lungs_test_check_breath("Lavaland air mixture", lab_rat, test_lungs, lavaland_test_mix) + if(SSmapping.config.map_name != "Oshan Station") + lungs_test_check_breath("Lavaland air mixture", lab_rat, test_lungs, lavaland_test_mix) /// Comprehensive unit test for [/obj/item/organ/internal/lungs/proc/check_breath()] /// If "expect_failure" is set to TRUE, the test ensures the given Human suffocated. From fb5bea26fdd06450aacb4b4f078c07f5c441db08 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 14 Oct 2023 12:14:27 -0400 Subject: [PATCH 4/4] Update lungs.dm --- code/modules/unit_tests/lungs.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/unit_tests/lungs.dm b/code/modules/unit_tests/lungs.dm index 0ff89a4defd6..3d9a800adc97 100644 --- a/code/modules/unit_tests/lungs.dm +++ b/code/modules/unit_tests/lungs.dm @@ -61,12 +61,13 @@ /datum/unit_test/lungs/lungs_sanity_ashwalker/Run() // Gas mix resembling one cell of lavaland's atmosphere. + if(SSmapping.config.map_name == "Oshan Station") + return var/datum/gas_mixture/lavaland_test_mix = create_lavaland_mix() var/obj/item/organ/internal/lungs/lavaland/test_lungs = allocate(/obj/item/organ/internal/lungs/lavaland) var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent) // Test one breath of Lavaland gas mix on Ashwalker lungs. - if(SSmapping.config.map_name != "Oshan Station") - lungs_test_check_breath("Lavaland air mixture", lab_rat, test_lungs, lavaland_test_mix) + lungs_test_check_breath("Lavaland air mixture", lab_rat, test_lungs, lavaland_test_mix) /// Comprehensive unit test for [/obj/item/organ/internal/lungs/proc/check_breath()] /// If "expect_failure" is set to TRUE, the test ensures the given Human suffocated.