diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 4180df4b30a2..1b30f3328465 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -17238,6 +17238,9 @@ name = "CentCom Security" }, /obj/effect/mapping_helpers/airlock/access/any/admin/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) "Zc" = ( diff --git a/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm b/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm index b9afa7452553..1201953d3555 100644 --- a/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm +++ b/_maps/~monkestation/RandomBars/Icebox/cultbar_icebox.dmm @@ -192,7 +192,6 @@ /area/station/service/theater) "iX" = ( /obj/effect/spawner/random/structure/musician/piano/random_piano, -/obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, /turf/open/floor/cult, /area/station/service/theater) @@ -401,7 +400,6 @@ "uL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/cult, /area/station/service/bar/backroom) "vh" = ( diff --git a/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm b/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm index 0a79c673dcd7..ae0b4e69c26f 100644 --- a/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm +++ b/_maps/~monkestation/RandomEngines/KiloStation/singularity.dmm @@ -93,8 +93,10 @@ "is" = ( /obj/structure/cable, /obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable/layer1, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "kilo_singularity_airlock" + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "iW" = ( @@ -106,11 +108,11 @@ "jc" = ( /obj/structure/cable, /obj/machinery/door/airlock/external, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, /obj/structure/fans/tiny, /obj/structure/cable/layer1, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "kilo_singularity_airlock" + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "jl" = ( @@ -396,7 +398,6 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) @@ -1004,7 +1005,7 @@ IJ rz Ib oK -Hs +oK pk Ii Ii @@ -1026,7 +1027,7 @@ En (12,1,1) = {" pa UA -oK +Hs NK pk lZ @@ -1121,9 +1122,9 @@ Ib oK NK pk -sz -sz -sz +oK +oK +oK Fj RL WZ diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 5b9d561afcae..4fb02a8bb3b6 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -439,6 +439,7 @@ Used by the AI doomsday and the self-destruct nuke. template.weight = (template.weight / 2) if(template.stock <= 0) template.spawned = TRUE + log_world("Loading random room template [template.name] ([template.type]) at [AREACOORD(R)]") template.stationinitload(get_turf(R), centered = template.centerspawner) SSmapping.random_room_spawners -= R qdel(R) @@ -459,6 +460,7 @@ Used by the AI doomsday and the self-destruct nuke. possible_engine_templates[engine_candidate] = engine_candidate.weight if(possible_engine_templates.len) var/datum/map_template/random_room/random_engines/template = pick_weight(possible_engine_templates) + log_world("Loading random engine template [template.name] ([template.type]) at [AREACOORD(engine_spawner)]") template.stationinitload(get_turf(engine_spawner), centered = template.centerspawner) SSmapping.random_engine_spawners -= engine_spawner qdel(engine_spawner) @@ -480,6 +482,7 @@ Used by the AI doomsday and the self-destruct nuke. possible_bar_templates[bar_candidate] = bar_candidate.weight if(possible_bar_templates.len) var/datum/map_template/random_room/random_bar/template = pick_weight(possible_bar_templates) + log_world("Loading random bar template [template.name] ([template.type]) at [AREACOORD(bar_spawner)]") template.stationinitload(get_turf(bar_spawner), centered = template.centerspawner) SSmapping.random_bar_spawners -= bar_spawner qdel(bar_spawner) @@ -500,6 +503,7 @@ Used by the AI doomsday and the self-destruct nuke. possible_arena_templates[arena_candidate] = arena_candidate.weight if(possible_arena_templates.len) var/datum/map_template/random_room/random_arena/template = pick_weight(possible_arena_templates) + log_world("Loading random arena template [template.name] ([template.type]) at [AREACOORD(arena_spawner)]") template.stationinitload(get_turf(arena_spawner), centered = template.centerspawner) SSmapping.random_arena_spawners -= arena_spawner qdel(arena_spawner) diff --git a/monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm b/monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm index 5ed0633862cc..64d10d42108c 100644 --- a/monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm +++ b/monkestation/code/modules/ghost_players/arena/arena_assets/event_floors.dm @@ -8,3 +8,9 @@ barefootstep = FOOTSTEP_HARD_BAREFOOT clawfootstep = FOOTSTEP_HARD_CLAW heavyfootstep = FOOTSTEP_GENERIC_HEAVY + +/turf/open/misc/ashplanet/rocky/arena + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + +/turf/open/water/arena + initial_gas_mix = OPENTURF_DEFAULT_ATMOS diff --git a/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm b/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm index 06e098ddcf56..de89b464516c 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm @@ -10,41 +10,31 @@ "b" = ( /mob/living/basic/aquatic/fish, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "d" = ( /obj/structure/flora/bush/stalky/style_3, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "g" = ( /obj/structure/flora/rock/pile/icy/style_2{ name = "rocks" }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "h" = ( /obj/structure/flora/rock/icy/style_2{ name = "rock" }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "i" = ( /obj/effect/overlay/water, /obj/machinery/light/floor/has_bulb, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "k" = ( /obj/structure/atlantis/column/broken_1, @@ -91,27 +81,21 @@ anchored = 1 }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "v" = ( /obj/structure/flora/rock/pile/icy/style_3{ name = "rocks" }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "w" = ( /obj/structure/flora/rock/icy{ name = "rock" }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "z" = ( /obj/effect/overlay/water, @@ -122,9 +106,7 @@ "A" = ( /obj/structure/flora/bush/stalky/style_2, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "B" = ( /obj/item/aquarium_prop/seaweed_top{ @@ -132,9 +114,7 @@ }, /obj/effect/overlay/water, /obj/machinery/light/floor/has_bulb, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "D" = ( /obj/effect/overlay/water, @@ -146,56 +126,42 @@ "E" = ( /obj/structure/flora/bush/stalky, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "G" = ( /obj/structure/flora/rock/pile/icy{ name = "rocks" }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "H" = ( /mob/living/basic/aquatic/fish/gupper, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "K" = ( /obj/structure/flora/rock/icy/style_3{ name = "rock" }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "L" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "N" = ( /obj/item/aquarium_prop/seaweed_top{ anchored = 1 }, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "P" = ( /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "Q" = ( /obj/structure/atlantis/statue{ @@ -209,9 +175,7 @@ "R" = ( /obj/structure/flora/bush/reed/style_3, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "T" = ( /obj/structure/atlantis/column/lantern, @@ -226,16 +190,12 @@ /obj/structure/flora/bush/reed/style_3, /mob/living/basic/aquatic/fish/gupper, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "V" = ( /mob/living/basic/aquatic/fish/cod, /obj/effect/overlay/water, -/turf/open/misc/ashplanet/rocky{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/misc/ashplanet/rocky, /area/centcom/tdome/arena/actual) "X" = ( /obj/effect/overlay/water, diff --git a/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm b/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm index ea3c06ee5cb5..c2bdb05d8de6 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm @@ -26,9 +26,7 @@ /area/centcom/tdome/arena/actual) "hA" = ( /obj/structure/flora/bush/reed/style_3, -/turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/water/arena, /area/centcom/tdome/arena/actual) "hL" = ( /obj/effect/turf_decal/siding/wood{ @@ -76,9 +74,7 @@ /area/centcom/tdome/arena/actual) "wZ" = ( /obj/machinery/light/directional/north, -/turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/water/arena, /area/centcom/tdome/arena/actual) "yW" = ( /obj/machinery/light/small/blacklight/directional/west, @@ -94,15 +90,11 @@ /area/centcom/tdome/arena/actual) "BT" = ( /obj/structure/flora/bush/reed/style_2, -/turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/water/arena, /area/centcom/tdome/arena/actual) "Cb" = ( /obj/machinery/light/directional/south, -/turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/water/arena, /area/centcom/tdome/arena/actual) "Cu" = ( /obj/effect/turf_decal/sand/plating, @@ -159,9 +151,7 @@ /turf/open/floor/wood/parquet, /area/centcom/tdome/arena/actual) "VF" = ( -/turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/water/arena, /area/centcom/tdome/arena/actual) "Wh" = ( /obj/effect/turf_decal/sand/plating, @@ -185,9 +175,7 @@ /area/centcom/tdome/arena/actual) "Zu" = ( /obj/structure/flora/bush/reed, -/turf/open/water{ - initial_gas_mix = "o2=22;n2=82;TEMP=293.15" - }, +/turf/open/water/arena, /area/centcom/tdome/arena/actual) (1,1,1) = {"