Merge pull request #454 from dwasint/whats-this

fixes tests

_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

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]")

code/modules/unit_tests/lungs.dm

@@ -61,6 +61,8 @@
 
 /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)

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)