Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes tests #454

Merged
merged 4 commits into from
Oct 14, 2023
Merged

fixes tests #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd2740d
bleh
dwasint Oct 14, 2023
60a89d5
Update patreon_data.dm
dwasint Oct 14, 2023
da7164d
oshan will cry with atmos stuff
dwasint Oct 14, 2023
fb5bea2
Update lungs.dm
dwasint Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -52202,7 +52212,7 @@ TV
qM
Mo
Jd
ew
No
dh
QC
aa
Expand Down
3 changes: 3 additions & 0 deletions code/modules/unit_tests/create_and_destroy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]")
Expand Down
2 changes: 2 additions & 0 deletions code/modules/unit_tests/lungs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions monkestation/code/datums/patreon_data.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading