diff --git a/aurorastation.dme b/aurorastation.dme index 5ddf81d949d..19bcf0280a1 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3771,6 +3771,7 @@ #include "maps\away\ships\dominia\dominian_unathi_privateer\dominian_unathi_privateer_ghostroles.dm" #include "maps\away\ships\dpra\hailstorm\hailstorm_areas.dm" #include "maps\away\ships\dpra\hailstorm\hailstorm_ghostroles.dm" +#include "maps\away\ships\dpra\hailstorm\hailstorm_landmarks.dm" #include "maps\away\ships\dpra\hailstorm\hailstorm_ship.dm" #include "maps\away\ships\einstein\ee_spy_ship.dm" #include "maps\away\ships\einstein\ee_spy_ship_ghostroles.dm" @@ -3824,11 +3825,13 @@ #include "maps\away\ships\nka\nka_merchant\nka_merchant.dm" #include "maps\away\ships\nka\nka_merchant\nka_merchant_areas.dm" #include "maps\away\ships\nka\nka_merchant\nka_merchant_ghostroles.dm" +#include "maps\away\ships\nka\nka_merchant\nka_merchant_landmarks.dm" #include "maps\away\ships\orion\orion_express_ship.dm" #include "maps\away\ships\orion\orion_express_ship_ghostroles.dm" #include "maps\away\ships\pra\database_freighter\database_freighter.dm" #include "maps\away\ships\pra\database_freighter\database_freighter_areas.dm" #include "maps\away\ships\pra\database_freighter\database_freighter_ghostroles.dm" +#include "maps\away\ships\pra\database_freighter\database_landmarks.dm" #include "maps\away\ships\pra\headmaster\headmaster_areas.dm" #include "maps\away\ships\pra\headmaster\headmaster_ghostroles.dm" #include "maps\away\ships\pra\headmaster\headmaster_ship.dm" @@ -3848,10 +3851,12 @@ #include "maps\away\ships\tajara\circus\adhomian_circus.dm" #include "maps\away\ships\tajara\circus\adhomian_circus_areas.dm" #include "maps\away\ships\tajara\circus\adhomian_circus_items.dm" +#include "maps\away\ships\tajara\circus\adhomian_circus_landmarks.dm" #include "maps\away\ships\tajara\circus\adhomian_circus_roles.dm" #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler.dm" #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler_areas.dm" #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler_ghostroles.dm" +#include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler_landmarks.dm" #include "maps\away\ships\tirakqi_smuggler\tirakqi_smuggler.dm" #include "maps\away\ships\tirakqi_smuggler\tirakqi_smuggler_areas.dm" #include "maps\away\ships\tirakqi_smuggler\tirakqi_smuggler_ghostroles.dm" diff --git a/code/__DEFINES/color.dm b/code/__DEFINES/color.dm index 6da480f868d..9a2b5fcac38 100644 --- a/code/__DEFINES/color.dm +++ b/code/__DEFINES/color.dm @@ -108,6 +108,7 @@ #define COLOR_TILED "#737878" #define COLOR_TILED_2 "#7A6E70" +#define COLOR_CONCRETE "#676661" // Blood colors #define COLOR_HUMAN_BLOOD "#A10808" diff --git a/code/modules/background/space_sectors/badlands.dm b/code/modules/background/space_sectors/badlands.dm index 8e23ac436a2..68847d768f4 100644 --- a/code/modules/background/space_sectors/badlands.dm +++ b/code/modules/background/space_sectors/badlands.dm @@ -5,7 +5,15 @@ but natives aren't known to treat settlements kindly." skybox_icon = "badlands" sector_welcome_message = 'sound/AI/welcome_badlands.ogg' - possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, /obj/effect/overmap/visitable/sector/exoplanet/barren, /obj/effect/overmap/visitable/sector/exoplanet/lava, /obj/effect/overmap/visitable/sector/exoplanet/desert, /obj/effect/overmap/visitable/sector/exoplanet/snow) + possible_exoplanets = list( + /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, + /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, + /obj/effect/overmap/visitable/sector/exoplanet/barren, + /obj/effect/overmap/visitable/sector/exoplanet/lava, + /obj/effect/overmap/visitable/sector/exoplanet/desert, + /obj/effect/overmap/visitable/sector/exoplanet/snow, + /obj/effect/overmap/visitable/sector/exoplanet/crystal + ) starlight_color = "#b13636" starlight_power = 2 starlight_range = 4 @@ -16,7 +24,15 @@ amount of old, dying stars and impassable nebulae. Due to close proximity to patrols on either end of this space, it isn't frequented much by criminal elements and is one of the \ safer parts of the known Frontier. After 2462, the Republic of Elyra has occupied the majority of Valley Hale, now bordering the Republic of Biesel." skybox_icon = "valley_hale" - possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, /obj/effect/overmap/visitable/sector/exoplanet/barren, /obj/effect/overmap/visitable/sector/exoplanet/lava, /obj/effect/overmap/visitable/sector/exoplanet/desert, /obj/effect/overmap/visitable/sector/exoplanet/snow) + possible_exoplanets = list( + /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, + /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, + /obj/effect/overmap/visitable/sector/exoplanet/barren, + /obj/effect/overmap/visitable/sector/exoplanet/lava, + /obj/effect/overmap/visitable/sector/exoplanet/desert, + /obj/effect/overmap/visitable/sector/exoplanet/snow, + /obj/effect/overmap/visitable/sector/exoplanet/crystal + ) starlight_color = "#e68831" starlight_power = 2 starlight_range = 4 @@ -50,7 +66,15 @@ almost perpetual snowfall and extremely low temperatures. It is currently divided between three factions involved in a cold war: the People's Republic of Adhomai, the Democratic People's \ Republic of Adhomai, and the New Kingdom of Adhomai." skybox_icon = "srandmarr" - possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir, /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara, /obj/effect/overmap/visitable/sector/exoplanet/barren/azmar, /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul, /obj/effect/overmap/visitable/sector/exoplanet/adhomai) + possible_exoplanets = list( + /obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir, + /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara, + /obj/effect/overmap/visitable/sector/exoplanet/barren/azmar, + /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul + ) + guaranteed_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/adhomai) + scheduled_port_visits = list("Thursday", "Sunday") + ports_of_call = list("the city of Nal'tor", "the city of Kaltir", "the city of Crevus") cargo_price_coef = list("nt" = 1.2, "hpi" = 1.2, "zhu" = 1.2, "een" = 1.2, "get" = 1.2, "arz" = 1.2, "blm" = 1.2, "iac" = 1.2, "zsc" = 0.5, "vfc" = 1.2, "bis" = 1.2, "xmg" = 1.2, "npi" = 1.2) starlight_color = "#50b7bb" starlight_power = 2 diff --git a/code/modules/maps/planet_types/lore/srandmarr.dm b/code/modules/maps/planet_types/lore/srandmarr.dm index ed015ce81bc..983779ebc1c 100644 --- a/code/modules/maps/planet_types/lore/srandmarr.dm +++ b/code/modules/maps/planet_types/lore/srandmarr.dm @@ -5,6 +5,7 @@ desc = "A planet comprised mainly of solid common minerals and silicate." color = "#bf7c39" icon_state = "globe1" + charted = "Tajaran core world, charted 2418CE, NanoTrasen Corporation" rock_colors = list(COLOR_GRAY80) features_budget = 1 surface_color = "#B1A69B" @@ -37,7 +38,6 @@ charted = "Tajaran core world, charted 2418CE, NanoTrasen Corporation" color = "#8f4754" icon_state = "globe2" - rock_colors = null plant_colors = null rock_colors = list("#4a3f41") features_budget = 1 @@ -135,7 +135,7 @@ geology = "Minimal tectonic heat, miniscule geothermal signature overall" weather = "Global full-atmosphere hydrological weather system. Substantial meteorological activity, violent storms unpredictable" surfacewater = "Majority frozen, 78% surface water. Significant tidal forces from natural satellite" - rock_colors = null + rock_colors = list("#6fb1b5") plant_colors = null flora_diversity = 0 has_trees = FALSE diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index b37ef94ed7f..edff834311b 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -405,12 +405,12 @@ drop_sound = 'sound/items/drop/boots.ogg' pickup_sound = 'sound/items/pickup/boots.ogg' -/material/stone/concrete +/material/concrete name = MATERIAL_CONCRETE - icon_base = "concrete" - icon_colour = "#D2D1CD" - colour_blend = FALSE - wall_icon = 'icons/turf/smooth/concrete_wall.dmi' + icon_colour = COLOR_CONCRETE + wall_colour = COLOR_CONCRETE + wall_icon = 'icons/turf/smooth/composite_solid_color.dmi' + table_icon = 'icons/obj/structure/tables/steel_table.dmi' stack_type = null golem = null diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 989f290fd0b..a0b6078747b 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -529,8 +529,7 @@ var/list/mineral_can_smooth_with = list( mined_turf = /turf/simulated/floor/exoplanet/mineral /turf/simulated/mineral/random/adhomai - icon = 'icons/turf/smooth/icy_wall.dmi' - actual_icon = 'icons/turf/smooth/icy_wall.dmi' + color = "#97A7AA" mined_turf = /turf/simulated/floor/exoplanet/mineral/adhomai /turf/simulated/mineral/random/high_chance @@ -564,8 +563,6 @@ var/list/mineral_can_smooth_with = list( mined_turf = /turf/simulated/floor/exoplanet/mineral /turf/simulated/mineral/random/high_chance/adhomai - icon = 'icons/turf/smooth/icy_wall.dmi' - actual_icon = 'icons/turf/smooth/icy_wall.dmi' mined_turf = /turf/simulated/floor/exoplanet/mineral/adhomai /turf/simulated/mineral/random/higher_chance @@ -617,8 +614,6 @@ var/list/mineral_can_smooth_with = list( mined_turf = /turf/simulated/floor/exoplanet/mineral /turf/simulated/mineral/adhomai - icon = 'icons/turf/smooth/icy_wall.dmi' - actual_icon = 'icons/turf/smooth/icy_wall.dmi' mined_turf = /turf/simulated/floor/exoplanet/mineral/adhomai /turf/simulated/mineral/crystal diff --git a/code/modules/overmap/exoplanets/decor/_areas.dm b/code/modules/overmap/exoplanets/decor/_areas.dm index 79a86058c0a..42f1da05855 100644 --- a/code/modules/overmap/exoplanets/decor/_areas.dm +++ b/code/modules/overmap/exoplanets/decor/_areas.dm @@ -9,6 +9,7 @@ name = "Adhomian Wilderness" ambience = list('sound/effects/wind/tundra0.ogg', 'sound/effects/wind/tundra1.ogg', 'sound/effects/wind/tundra2.ogg', 'sound/effects/wind/spooky0.ogg', 'sound/effects/wind/spooky1.ogg') base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai + area_blurb = "The freezing wind blows through the unforgiving Adhomian wilderness." /area/exoplanet/barren name = "\improper Planetary surface" @@ -23,6 +24,7 @@ name = "Raskara Surface" ambience = AMBIENCE_OTHERWORLDLY base_turf = /turf/simulated/floor/exoplanet/barren/raskara + area_blurb = "The dark surface of the moon is quiet. The ambience is eerie." /area/exoplanet/barren/burzsia name = "Burzsia Surface" diff --git a/code/modules/overmap/exoplanets/decor/turfs/ice.dm b/code/modules/overmap/exoplanets/decor/turfs/ice.dm index ffe601669e4..74b66fe4758 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/ice.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/ice.dm @@ -7,5 +7,11 @@ /turf/simulated/floor/exoplanet/ice/update_icon() return +/turf/simulated/floor/exoplanet/ice/cold //temperature is -5 celsius + temperature = 268.15 + /turf/simulated/floor/exoplanet/ice/dark icon_state = "icedark" + +/turf/simulated/floor/exoplanet/ice/dark/cold //temperature is -5 celsius + temperature = 268.15 diff --git a/code/modules/overmap/exoplanets/decor/turfs/snow.dm b/code/modules/overmap/exoplanets/decor/turfs/snow.dm index 88e780362b7..8ee31811038 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/snow.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/snow.dm @@ -26,8 +26,14 @@ /turf/simulated/floor/exoplanet/snow/melt() ChangeTurf(/turf/simulated/floor/exoplanet/permafrost) +/turf/simulated/floor/exoplanet/snow/cold //temperature is -5 celsius + temperature = 268.15 + /turf/simulated/floor/exoplanet/permafrost name = "permafrost" icon = 'icons/turf/flooring/snow.dmi' icon_state = "permafrost" footstep_sound = /singleton/sound_category/asteroid_footstep + +/turf/simulated/floor/exoplanet/permafrost/cold //temperature is -5 celsius + temperature = 268.15 diff --git a/code/modules/overmap/exoplanets/decor/turfs/wood.dm b/code/modules/overmap/exoplanets/decor/turfs/wood.dm index fdd46b8269a..68b496ecafc 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/wood.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/wood.dm @@ -1,13 +1,14 @@ /turf/simulated/floor/exoplanet/wood name = "wooden floor" icon = 'icons/turf/flooring/tiles.dmi' - icon_state = "wood_preview" + icon_state = "wood" initial_flooring = /singleton/flooring/wood footstep_sound = /singleton/sound_category/wood_footstep tile_outline = "wood" tile_decal_state = "wood" broken_overlay = "wood" tile_outline_alpha = 75 + color = WOOD_COLOR_GENERIC /turf/simulated/floor/exoplanet/wood/bamboo initial_flooring = /singleton/flooring/wood/bamboo diff --git a/html/changelogs/alberyk-othersystemupdate.yml b/html/changelogs/alberyk-othersystemupdate.yml new file mode 100644 index 00000000000..3085697028c --- /dev/null +++ b/html/changelogs/alberyk-othersystemupdate.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Updated and fixed some content from old space sectors." diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dm b/maps/away/away_site/abandoned_diner/abandoned_diner.dm index 8168db09a2e..80647292d4a 100644 --- a/maps/away/away_site/abandoned_diner/abandoned_diner.dm +++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dm @@ -9,6 +9,7 @@ suffixes = list("away_site/abandoned_diner/abandoned_diner.dmm") sectors = list(ALL_CORPORATE_SECTORS) + sectors_blacklist = list(SECTOR_TAU_CETI, SECTOR_HANEUNIM) /singleton/submap_archetype/abandoned_diner//Arbitrary duplicates of the above name/desc map = "abandoned diner" diff --git a/maps/away/away_site/blueriver/blueriver.dm b/maps/away/away_site/blueriver/blueriver.dm index 782b1ceb35f..791c9a7bbb2 100644 --- a/maps/away/away_site/blueriver/blueriver.dm +++ b/maps/away/away_site/blueriver/blueriver.dm @@ -7,7 +7,7 @@ suffixes = list("away_site/blueriver/blueriver-1.dmm","away_site/blueriver/blueriver-2.dmm") generate_mining_by_z = 2 sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM) //it's a whole ass planet, shouldn't have it in predefined sectors + sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM, SECTOR_TAU_CETI, SECTOR_SRANDMARR) //it's a whole ass planet, shouldn't have it in predefined sectors unit_test_groups = list(1) diff --git a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm index e1b9813e16b..77c977e200e 100644 --- a/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm +++ b/maps/away/away_site/crashed_elyran_tanker/crashed_elyran_tanker.dm @@ -4,7 +4,7 @@ name = "Crashed Elyran Tanker" description = "A small tanker, emitting a very faint IFF signal of civilian vessels registered in Elyra. It seems to be partially embedded into a small asteroid, and appears to be completely cold." suffixes = list("away_site/crashed_elyran_tanker/crashed_elyran_tanker.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ) spawn_weight = 1 spawn_cost = 1 id = "crashed_elyran_tanker" diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm index e93669510c6..507ee632b74 100644 --- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm +++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm @@ -6,7 +6,7 @@ spawn_weight = 1 suffixes = list("away_site/crystal_planet_outpost/crystal_planet_outpost.dmm") sectors = list(ALL_POSSIBLE_SECTORS) - sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM) //it's a whole planet, shouldn't have it in predefined sectors + sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM, SECTOR_SRANDMARR, SECTOR_TAU_CETI) //it's a whole planet, shouldn't have it in predefined sectors unit_test_groups = list(1) /singleton/submap_archetype/crystal_planet_outpost diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dm b/maps/away/away_site/hivebot_hub/hivebot_hub.dm index 29bebb523f5..0db603e0bc3 100644 --- a/maps/away/away_site/hivebot_hub/hivebot_hub.dm +++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dm @@ -4,7 +4,7 @@ id = "hivebot_hub" suffixes = list("away_site/hivebot_hub/hivebot_hub.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS) + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS) spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/magshield/magshield.dm b/maps/away/away_site/magshield/magshield.dm index b4d3fe9eee3..1b029ced8bb 100644 --- a/maps/away/away_site/magshield/magshield.dm +++ b/maps/away/away_site/magshield/magshield.dm @@ -2,7 +2,7 @@ name = "Magshield" id = "magshield" description = "It's an orbital shield station." - sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS) + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS) suffixes = list("away_site/magshield/magshield.dmm") spawn_weight = 1 spawn_cost = 1 diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index 14e1a8f8f9e..c7a93883fef 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -6,14 +6,8 @@ /obj/structure/closet/secure_closet/freezer/money, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) -"ab" = ( -/obj/machinery/door/airlock/silver{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/grand_romanovich) "ac" = ( -/obj/effect/map_effect/window_spawner/full/reinforced, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor, /area/grand_romanovich) "ad" = ( @@ -57,12 +51,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/grand_romanovich) -"aj" = ( -/obj/machinery/door/airlock/silver{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/grand_romanovich) "ak" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ @@ -131,26 +119,6 @@ }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) -"as" = ( -/obj/machinery/door/airlock/silver{ - dir = 4 - }, -/turf/simulated/floor/tiled/freezer, -/area/grand_romanovich) -"at" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"au" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "av" = ( /obj/machinery/light/small{ dir = 1 @@ -251,7 +219,7 @@ /obj/machinery/door/blast/regular/open{ id = "lockdown" }, -/obj/effect/map_effect/window_spawner/full/reinforced, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor, /area/grand_romanovich) "aK" = ( @@ -397,27 +365,6 @@ }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) -"be" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"bf" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"bg" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "bh" = ( /obj/machinery/light{ dir = 1; @@ -431,20 +378,6 @@ /obj/machinery/vending/casino, /turf/simulated/floor/wood, /area/grand_romanovich) -"bi" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"bj" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "bk" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 1 @@ -475,13 +408,6 @@ }, /turf/simulated/floor/wood, /area/grand_romanovich) -"bn" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "bo" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8; @@ -503,19 +429,6 @@ /obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) -"bq" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"br" = ( -/obj/machinery/door/airlock/glass{ - dir = 1 - }, -/turf/simulated/floor/carpet/art, -/area/grand_romanovich) "bs" = ( /obj/machinery/door/airlock/glass{ dir = 1 @@ -936,20 +849,6 @@ /obj/structure/kitchenspike, /turf/simulated/floor/tiled/freezer, /area/grand_romanovich) -"cn" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"co" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "cp" = ( /obj/structure/reagent_dispensers/cookingoil, /turf/simulated/floor/tiled/freezer{ @@ -1124,7 +1023,7 @@ dir = 1; icon_state = "spline_fancy" }, -/obj/effect/map_effect/window_spawner/full/reinforced, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor, /area/grand_romanovich) "cB" = ( @@ -1430,13 +1329,6 @@ }, /turf/simulated/floor/wood, /area/grand_romanovich) -"di" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "dj" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4; @@ -2691,13 +2583,6 @@ }, /turf/simulated/floor/wood, /area/grand_romanovich) -"gd" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "ge" = ( /obj/effect/floor_decal/spline/plain{ dir = 8; @@ -2764,13 +2649,6 @@ }, /turf/simulated/floor/snow, /area/grand_romanovich) -"gm" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "gn" = ( /obj/effect/floor_decal/corner/yellow{ dir = 1; @@ -2801,13 +2679,6 @@ }, /turf/simulated/floor/carpet/art, /area/grand_romanovich) -"gs" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "gt" = ( /obj/effect/floor_decal/corner/yellow{ dir = 5; @@ -3061,13 +2932,6 @@ }, /turf/simulated/floor, /area/grand_romanovich) -"hc" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "hd" = ( /obj/machinery/light{ dir = 1; @@ -3117,13 +2981,6 @@ /obj/item/gun/energy/stunrevolver, /turf/simulated/floor/wood, /area/grand_romanovich) -"hj" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "hk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3175,13 +3032,6 @@ }, /turf/simulated/floor/wood, /area/grand_romanovich) -"hr" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "hs" = ( /obj/machinery/light{ dir = 8; @@ -3437,16 +3287,6 @@ /obj/item/device/radio/intercom/north, /turf/simulated/floor/wood, /area/grand_romanovich) -"hZ" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, -/area/grand_romanovich) -"ia" = ( -/obj/machinery/door/airlock/glass{ - dir = 1 - }, -/turf/simulated/floor/carpet/art, -/area/grand_romanovich) "ib" = ( /obj/machinery/light/small, /obj/structure/table/wood, @@ -3455,13 +3295,6 @@ temperature = 278 }, /area/grand_romanovich/outdoors) -"ic" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "id" = ( /obj/structure/bed/stool/chair/shuttle, /turf/simulated/floor/shuttle, @@ -3576,12 +3409,6 @@ /obj/random/loot, /turf/simulated/floor, /area/grand_romanovich) -"iw" = ( -/obj/machinery/door/airlock/glass{ - dir = 1 - }, -/turf/simulated/floor/carpet/art, -/area/grand_romanovich) "ix" = ( /obj/machinery/door/airlock/glass{ dir = 1 @@ -3782,15 +3609,6 @@ "ja" = ( /turf/simulated/floor/wood, /area/grand_romanovich) -"jb" = ( -/obj/machinery/door/airlock/glass{ - dir = 1 - }, -/obj/machinery/door/blast/regular/open{ - id = "lockdown" - }, -/turf/simulated/floor/carpet/art, -/area/grand_romanovich) "jc" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8; @@ -3854,31 +3672,11 @@ /obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) -"ji" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "jj" = ( /obj/structure/table/stone/marble, /obj/item/device/radio/phone, /turf/simulated/floor/wood, /area/grand_romanovich) -"jk" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"jl" = ( -/obj/machinery/door/airlock/glass{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/grand_romanovich) "jm" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -4173,34 +3971,6 @@ }, /turf/simulated/floor/wood, /area/grand_romanovich) -"kd" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"ke" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"kf" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) -"kg" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(202); - dir = 1 - }, -/turf/simulated/floor, -/area/grand_romanovich) "kh" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, /obj/machinery/door/airlock/command{ @@ -5194,7 +4964,7 @@ /obj/machinery/door/blast/regular/open{ id = "lockdown" }, -/obj/effect/map_effect/window_spawner/full/reinforced, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor, /area/grand_romanovich/outdoors) "mT" = ( @@ -5901,13 +5671,6 @@ /obj/effect/floor_decal/spline/fancy/wood/corner, /turf/simulated/floor/wood, /area/grand_romanovich) -"pN" = ( -/obj/machinery/door/airlock/medical{ - name = "Medbay"; - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/grand_romanovich) "qf" = ( /obj/structure/bed/padded, /obj/item/bedsheet/brown, @@ -7243,14 +7006,6 @@ temperature = 278 }, /area/grand_romanovich/outdoors) -"KI" = ( -/obj/machinery/door/blast/regular/open{ - id = "lockdown" - }, -/obj/effect/map_effect/window_spawner/full/reinforced, -/obj/effect/map_effect/window_spawner/full/reinforced, -/turf/simulated/floor, -/area/grand_romanovich) "KO" = ( /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -17260,7 +17015,7 @@ kZ kZ kZ XU -ab +ai XU ai XU @@ -17996,7 +17751,7 @@ Vn Tu ja ja -hZ +JI Ln bC bC @@ -18253,7 +18008,7 @@ FX ja ja ja -hZ +JI dI bC bC @@ -18288,9 +18043,9 @@ kZ kZ kZ XU -aj +ai XU -as +ai XU bC bC @@ -18811,7 +18566,7 @@ XU XU aK lO -at +ki OF OF XU @@ -19065,13 +18820,13 @@ IP IP IP OF -au +ki lO lO XU OF IP -be +ki OF IP ig @@ -19285,7 +19040,7 @@ US kK Tu ja -hZ +JI dI XU XU @@ -19542,8 +19297,8 @@ ja yr yr ja -hZ -bf +JI +ki OF OF OF @@ -19553,7 +19308,7 @@ OF OF OF OF -bg +ki OF IP XU @@ -19813,7 +19568,7 @@ XU XU OF OF -bi +ki Pa jc bK @@ -19842,7 +19597,7 @@ ed XU IP OF -bj +ki dv jc bK @@ -20056,7 +19811,7 @@ Ix db db Ix -hZ +JI dI dI dI @@ -21612,7 +21367,7 @@ kZ XU OF IP -bn +ki dv jc bK @@ -21641,7 +21396,7 @@ ed XU OF OF -bq +ki dv jc bK @@ -22345,7 +22100,7 @@ lO lO lO af -hZ +JI XU aK lO @@ -23406,7 +23161,7 @@ lO lO lO lO -br +bs lO lO lO @@ -24227,7 +23982,7 @@ lO XU OF OF -cn +ki OF OF OF @@ -24439,7 +24194,7 @@ XU IP OF OF -co +ki dv jc bK @@ -24468,7 +24223,7 @@ ed XU OF IP -di +ki dv jc bK @@ -26223,7 +25978,7 @@ af Md Md ja -hZ +JI XU XU LU @@ -26238,7 +25993,7 @@ OF XU OF OF -gd +ki dv jc bK @@ -26267,7 +26022,7 @@ ed XU OF OF -gm +ki uq jc bK @@ -26744,8 +26499,8 @@ ja ja ja ja -hZ -gs +JI +ki OF OF OF @@ -26992,7 +26747,7 @@ ja QA ja ja -hZ +JI XU Zz kK @@ -27006,7 +26761,7 @@ XU OF OF OF -hc +ki OF OF XU @@ -27506,7 +27261,7 @@ ja QA ja ja -hZ +JI Zp hx ja @@ -27790,7 +27545,7 @@ OF OF iq OF -hj +ki OF OF XU @@ -28020,10 +27775,10 @@ aI XU af ja -hZ +JI XU MF -hZ +JI lO lO lO @@ -28068,7 +27823,7 @@ OF IP IP IP -hr +ki dl cy dy @@ -28076,7 +27831,7 @@ Tu ja ep ep -hZ +JI lO lO ej @@ -28333,7 +28088,7 @@ ja ja ja ja -hZ +JI lO lO ej @@ -28839,7 +28594,7 @@ lO lO lO lO -ia +bs lO lO lO @@ -28858,7 +28613,7 @@ ja ja ep ep -hZ +JI aI af am @@ -28873,7 +28628,7 @@ ja am iP ja -hZ +JI XU kZ kZ @@ -29084,7 +28839,7 @@ IP il IP OF -ic +ki af ja ja @@ -29096,7 +28851,7 @@ lO lO lO lO -iw +bs lO lO lO @@ -29115,7 +28870,7 @@ ja ja ep ep -hZ +JI aI af am @@ -29618,7 +29373,7 @@ ja ja ak iO -hZ +JI lO lO lP @@ -29875,7 +29630,7 @@ ja ja am iP -hZ +JI lO lO ej @@ -30132,7 +29887,7 @@ ja ja am iP -hZ +JI lO lO ec @@ -30389,7 +30144,7 @@ ja ja am iP -hZ +JI lO lO lO @@ -30646,7 +30401,7 @@ ja ja am iP -hZ +JI lO lO lO @@ -30873,7 +30628,7 @@ Fv Fv Fv Fv -hZ +JI lO lO jQ @@ -30903,7 +30658,7 @@ ja ja am iP -hZ +JI lO lO lO @@ -30932,7 +30687,7 @@ lO lO lO lO -jb +ix lO lO lO @@ -31130,7 +30885,7 @@ Fv Fv Fv Fv -hZ +JI lO lO Jb @@ -31160,7 +30915,7 @@ ja ju am iP -hZ +JI lO lO ZY @@ -31207,7 +30962,7 @@ XU XU XU aI -pN +jf XU XU XU @@ -31387,7 +31142,7 @@ zX Fv Fv Fv -hZ +JI lO lO jQ @@ -31417,7 +31172,7 @@ jt XU ca kY -hZ +JI lO lO af @@ -31428,7 +31183,7 @@ ja ja eu nq -hZ +JI aI cz ak @@ -31454,7 +31209,7 @@ ht kx af ja -hZ +JI XU XU kZ @@ -31644,7 +31399,7 @@ zX zX Fv Fv -hZ +JI lO lO jQ @@ -31674,7 +31429,7 @@ ja iL am iP -hZ +JI lO lO af @@ -31685,7 +31440,7 @@ ja ja aF ns -hZ +JI aI af am @@ -31901,7 +31656,7 @@ zX Fv Fv Fv -hZ +JI lO lO jQ @@ -31931,7 +31686,7 @@ ja ja am iP -hZ +JI lO lO eq @@ -31942,7 +31697,7 @@ ja ep aP nt -hZ +JI aI af am @@ -32158,7 +31913,7 @@ Fv Fv Fv Fv -hZ +JI lO lO Jb @@ -32188,7 +31943,7 @@ ja ja am iP -hZ +JI lO lO af @@ -32199,7 +31954,7 @@ ja ja ja ja -hZ +JI aI af am @@ -32214,7 +31969,7 @@ ja am iP ja -hZ +JI XU kZ kZ @@ -32415,7 +32170,7 @@ Fv Fv Fv Fv -hZ +JI lO lO jQ @@ -32445,7 +32200,7 @@ ja ja am iP -hZ +JI lO lO af @@ -32456,7 +32211,7 @@ ja ja ja ja -hZ +JI aI af am @@ -32702,7 +32457,7 @@ ja ja am iP -hZ +JI lO lO af @@ -32713,7 +32468,7 @@ ja ja eu nq -hZ +JI aI af am @@ -32959,7 +32714,7 @@ ja ja am iP -hZ +JI lO lO af @@ -32970,7 +32725,7 @@ ja ja aF ns -hZ +JI aI af am @@ -33174,7 +32929,7 @@ OF OF OF OF -ji +ki gP lO lO @@ -33216,7 +32971,7 @@ ja ja aB iQ -hZ +JI lO lO oD @@ -33227,7 +32982,7 @@ ja ep aP nt -hZ +JI aI af aB @@ -33241,7 +32996,7 @@ iQ ja aB iQ -hZ +JI XU XU XU @@ -33454,7 +33209,7 @@ kZ XU dY OF -jk +ki dB dB fM @@ -33766,7 +33521,7 @@ ja ja ja ja -hZ +JI XU kZ kZ @@ -34023,7 +33778,7 @@ ja ja ja ja -hZ +JI XU kZ kZ @@ -34234,7 +33989,7 @@ jQ lO lO af -hZ +JI XU nc lS @@ -35519,7 +35274,7 @@ jQ lO lO af -hZ +JI XU nc lh @@ -35776,8 +35531,8 @@ jQ lO lO af -hZ -jl +JI +jv nc lh XU @@ -36033,7 +35788,7 @@ jQ lO lO af -hZ +JI jv nc lh @@ -36290,7 +36045,7 @@ ea lO lO af -hZ +JI XU nc lh @@ -37318,7 +37073,7 @@ jS lO lO af -hZ +JI XU nc lh @@ -37354,7 +37109,7 @@ eV fn nV lh -kd +ki OF IP XU @@ -37575,7 +37330,7 @@ ea lO lO af -hZ +JI XU nc lh @@ -37828,7 +37583,7 @@ ja ja ja ja -hZ +JI lO lO af @@ -39117,7 +38872,7 @@ ea lO lO af -hZ +JI XU nc lh @@ -39365,12 +39120,12 @@ OF OF OF OF -ke +ki af ja ja ja -hZ +JI lO lO af @@ -39627,7 +39382,7 @@ eA ja ja aK -hZ +JI lO lO af @@ -39654,7 +39409,7 @@ ik OF OF OF -kf +ki nc lE lh @@ -39884,7 +39639,7 @@ af ja ja ja -hZ +JI lO lO af @@ -39915,7 +39670,7 @@ XU nc lS lh -kg +ki IP IP OF @@ -40390,7 +40145,7 @@ ja ja ja ja -hZ +JI XU bu XU @@ -40647,7 +40402,7 @@ ac cW ac ja -hZ +JI fA nC nC @@ -40904,7 +40659,7 @@ ja cX db ja -hZ +JI fB nw gb @@ -41161,7 +40916,7 @@ ja ja ac ja -hZ +JI XU XU XU @@ -41175,7 +40930,7 @@ aI XU aI aI -KI +aI XU XU kZ @@ -41675,7 +41430,7 @@ ja ja ac ja -hZ +JI aI kZ aI @@ -42189,7 +41944,7 @@ ja ja ac ja -hZ +JI aI kZ aI @@ -42446,7 +42201,7 @@ ja cX db ja -hZ +JI aI kZ XU @@ -42703,7 +42458,7 @@ ja ja ac ja -hZ +JI aI kZ XU @@ -46546,7 +46301,7 @@ kZ kZ aI af -hZ +JI lW mg mg @@ -46558,7 +46313,7 @@ mg mg mO af -hZ +JI aI kZ aI @@ -46815,7 +46570,7 @@ kK kK kK Tu -hZ +JI aI kZ aI @@ -47329,7 +47084,7 @@ mj mj mJ ja -hZ +JI XU XU XU @@ -48357,7 +48112,7 @@ mj mj mJ ja -hZ +JI XU XU XU @@ -48871,7 +48626,7 @@ aD aD aD bU -hZ +JI aI kZ XU @@ -49116,7 +48871,7 @@ kZ kZ aI af -hZ +JI lX mh mh @@ -49128,7 +48883,7 @@ mh mh mP af -hZ +JI aI kZ XU @@ -52459,7 +52214,7 @@ kZ kZ aI af -hZ +JI lW mg mg @@ -52469,7 +52224,7 @@ mg mg mO af -hZ +JI aI kZ aI @@ -52726,7 +52481,7 @@ kK kK kK Tu -hZ +JI aI kZ aI @@ -53240,7 +52995,7 @@ TP ev ex ja -hZ +JI XU kZ XU @@ -53497,7 +53252,7 @@ el er ey ja -hZ +JI XU XU XU @@ -54525,7 +54280,7 @@ el er eD ja -hZ +JI XU XU XU @@ -55039,7 +54794,7 @@ aD aD aD bU -hZ +JI aI kZ XU @@ -55286,7 +55041,7 @@ kZ kZ aI af -hZ +JI lX mh mh @@ -55296,7 +55051,7 @@ mh mh mP af -hZ +JI aI kZ XU @@ -57866,7 +57621,7 @@ ja ja aK ja -hZ +JI XU kZ XU @@ -58123,7 +57878,7 @@ lS lS lS lS -hZ +JI XU kZ XU @@ -58380,7 +58135,7 @@ lS lS lS lS -hZ +JI XU kZ XU @@ -58637,7 +58392,7 @@ lS lS lS lS -hZ +JI XU kZ aI @@ -58894,7 +58649,7 @@ lS lS lS lS -hZ +JI XU kZ aI @@ -59408,7 +59163,7 @@ lS lS lS lS -hZ +JI XU kZ XU @@ -59665,7 +59420,7 @@ lS lS lS lS -hZ +JI XU XU XU @@ -60693,7 +60448,7 @@ lS lS lS lS -hZ +JI XU XU XU @@ -60950,7 +60705,7 @@ lS lS lS lS -hZ +JI XU kZ XU @@ -61207,7 +60962,7 @@ lS lS lS lS -hZ +JI XU kZ aI @@ -61464,7 +61219,7 @@ lS lS lS lS -hZ +JI XU kZ aI @@ -61978,7 +61733,7 @@ lS lS lS lS -hZ +JI XU kZ XU @@ -62235,7 +61990,7 @@ ja ja aK ja -hZ +JI XU kZ XU diff --git a/maps/away/away_site/sol_bunker/bunker.dm b/maps/away/away_site/sol_bunker/bunker.dm index 63d30302986..9f48832fe2d 100644 --- a/maps/away/away_site/sol_bunker/bunker.dm +++ b/maps/away/away_site/sol_bunker/bunker.dm @@ -2,7 +2,7 @@ name = "lone asteroid" description = "A lone asteroid. Strange signals are coming from this one." suffixes = list("away_site/sol_bunker/bunker.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_WEEPING_STARS) + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_WEEPING_STARS) spawn_weight = 1 spawn_cost = 1 id = "abandoned_bunker" diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm index 356e1e64950..d9d63cc6b59 100644 --- a/maps/away/away_site/tajara/mining_jack/mining_jack.dmm +++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dmm @@ -1145,7 +1145,7 @@ /turf/simulated/wall/shuttle/raider, /area/shuttle/mining_jack/engines) "sW" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 4; id = "mining_jack_bridge" @@ -2139,7 +2139,7 @@ }, /area/shuttle/mining_jack/bridge) "Oc" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 2; id = "mining_jack_bridge" @@ -2433,7 +2433,7 @@ }, /area/shuttle/mining_jack/engines) "XK" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm b/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm index 8a256617ec0..d72d6077930 100644 --- a/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm +++ b/maps/away/away_site/tajara/peoples_station/peoples_station_zones.dm @@ -6,6 +6,7 @@ no_light_control = TRUE base_turf = /turf/space area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "The clean and highly organized walls of the station welcomes you. The People's Republic of Adhomai's anthem can be heard from the speakers." /area/peoples_station/barracks name = "People's Space Station Barracks" diff --git a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm index 861795ff233..439807507dc 100644 --- a/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm +++ b/maps/away/away_site/tajara/pra_satellite/pra_satellite.dmm @@ -234,7 +234,9 @@ }, /area/pra_satellite) "du" = ( -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -364,7 +366,7 @@ }, /area/pra_satellite) "gb" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor{ temperature = 278.15 }, @@ -529,14 +531,6 @@ temperature = 278.15 }, /area/pra_satellite) -"iR" = ( -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/pra_satellite) "jb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled{ @@ -1030,14 +1024,6 @@ temperature = 278.15 }, /area/pra_satellite) -"wU" = ( -/obj/effect/floor_decal/corner/black{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark{ - temperature = 278.15 - }, -/area/pra_satellite) "yh" = ( /turf/simulated/floor/tiled{ temperature = 278.15 @@ -1059,7 +1045,9 @@ }, /area/pra_satellite) "yE" = ( -/obj/structure/sign/flag/pra/large/south, +/obj/structure/sign/flag/pra/large/south{ + pixel_y = -32 + }, /obj/effect/floor_decal/corner/black{ dir = 10 }, @@ -1380,7 +1368,9 @@ }, /area/pra_satellite) "HQ" = ( -/obj/structure/sign/flag/pra/large/west, +/obj/structure/sign/flag/pra/large/west{ + pixel_x = -32 + }, /turf/simulated/floor/carpet/art{ temperature = 278.15 }, @@ -1526,7 +1516,9 @@ }, /area/pra_satellite) "PQ" = ( -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -28149,7 +28141,7 @@ wc Kn Kn gb -iR +Jy wD wc bu @@ -28394,7 +28386,7 @@ HQ hD mk aN -wU +AA wc Kn wg @@ -28406,7 +28398,7 @@ wc wc wg gb -iR +Jy aK wc wc @@ -28663,7 +28655,7 @@ cw gb Kn gb -iR +Jy fU yx wc @@ -29177,7 +29169,7 @@ CM gb Kn gb -iR +Jy Wy Av wc @@ -29434,7 +29426,7 @@ wc wc wg gb -iR +Jy aK wc wc @@ -29691,7 +29683,7 @@ wc Kn Kn gb -iR +Jy AA wc bu @@ -29936,7 +29928,7 @@ wc wc wc GK -wU +AA wc Kn wg diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dmm b/maps/away/away_site/tajara/scrapper/scrapper.dmm index b69fa0920d8..94d0a12c7d0 100644 --- a/maps/away/away_site/tajara/scrapper/scrapper.dmm +++ b/maps/away/away_site/tajara/scrapper/scrapper.dmm @@ -235,7 +235,7 @@ /turf/simulated/floor/tiled/freezer, /area/scrapper_base/quarters) "da" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 4; id = "scrapper_bridge" @@ -768,7 +768,7 @@ }, /area/shuttle/scrapper_ship/atmos) "jK" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 4; id = "scrapper_bridge" @@ -900,7 +900,7 @@ /area/scrapper_base) "lE" = ( /obj/effect/map_effect/airlock/s_to_n, -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1426,7 +1426,7 @@ /area/shuttle/scrapper_ship/starboard_engines) "ss" = ( /obj/effect/map_effect/airlock/w_to_e/long/square, -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1827,7 +1827,7 @@ /turf/simulated/floor/tiled/dark, /area/scrapper_base) "ww" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2507,7 +2507,7 @@ /turf/simulated/floor/tiled/dark, /area/scrapper_base/storage) "Gr" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2847,7 +2847,7 @@ /turf/simulated/wall/shuttle/raider, /area/scrapper_base) "JV" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -2948,7 +2948,7 @@ /area/shuttle/scrapper_ship/storage) "LA" = ( /obj/effect/map_effect/airlock/long/square, -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm index 79d365dd5a2..a503560751e 100644 --- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm +++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dmm @@ -1,10 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/obj/machinery/door/airlock/hatch{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/tajara_safehouse) "ab" = ( /obj/structure/extinguisher_cabinet/west{ }, @@ -22,12 +16,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/tajara_safehouse) -"ae" = ( -/obj/machinery/door/airlock/hatch{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/tajara_safehouse) "aF" = ( /obj/effect/decal/cleanable/dirt, /obj/random/junk, @@ -27752,7 +27740,7 @@ xQ xQ xQ xQ -aa +ac lH dR nk @@ -30085,7 +30073,7 @@ lH lH lH lH -ae +ac sI lH lH diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm index 4f5400e8394..e0c7e21bba8 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dm @@ -2,7 +2,7 @@ name = "wrecked NT ship" description = "A wrecked ship once owned by NanoTrasen." suffixes = list("away_site/wrecked_nt_ship/wrecked_nt_ship.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, SECTOR_SRANDMARR) sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM) //NT has pretty much no presence in either of these, why would there be a wrecked ship spawn_weight = 1 spawn_cost = 2 diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm index dab73554145..40f4caa695e 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dm @@ -2,7 +2,7 @@ name = "TCFL Corvette" description = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one appears to be a Decanus-class, the Tau Ceti Foreign Legion variation of the design." suffixes = list("ships/tcfl_patrol/tcfl_peacekeeper_ship.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 id = "tcfl_peacekeeper_ship" diff --git a/maps/away/ships/casino/casino.dm b/maps/away/ships/casino/casino.dm index 5684dceecd6..0bf17e122ce 100644 --- a/maps/away/ships/casino/casino.dm +++ b/maps/away/ships/casino/casino.dm @@ -2,7 +2,7 @@ name = "Casino" description = "A casino ship!" suffixes = list("ships/casino/casino.dmm") - sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS) + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_UUEOAESA, ALL_COALITION_SECTORS) spawn_weight = 1 spawn_cost = 1 id = "awaysite_casino" diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_landmarks.dm b/maps/away/ships/dpra/hailstorm/hailstorm_landmarks.dm new file mode 100644 index 00000000000..f245f6df4d4 --- /dev/null +++ b/maps/away/ships/dpra/hailstorm/hailstorm_landmarks.dm @@ -0,0 +1,34 @@ +// --------------------- base type + +/obj/effect/shuttle_landmark/hailstorm_ship + base_area = /area/space + base_turf = /turf/space + +// --------------------- shuttle + +/obj/effect/shuttle_landmark/hailstorm_shuttle/hangar + name = "Spacer Militia Shuttle Hangar" + landmark_tag = "nav_hailstorm_shuttle" + docking_controller = "hailstorm_shuttle_dock" + base_area = /area/space + base_turf = /turf/space + movable_flags = MOVABLE_FLAG_EFFECTMOVE + +// ---- + +/obj/effect/shuttle_landmark/hailstorm_shuttle/transit + name = "In transit" + landmark_tag = "nav_transit_hailstorm_shuttle" + base_turf = /turf/space/transit/north + +// --------------------- docks + +/obj/effect/shuttle_landmark/hailstorm_ship/dock/aft + name = "Dock, Aft" + landmark_tag = "nav_hailstorm_ship_starboard" + docking_controller = "airlock_hailstorm_ship_starboard" + +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft + name = "Dock, Aft" + landmark_tag = "nav_hailstorm_ship_dock_starboard" + master_tag = "airlock_hailstorm_ship_starboard" diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm index f0934d86e48..ee5444aec96 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dm @@ -94,7 +94,6 @@ name = "shuttle control console" shuttle_tag = "Spacer Militia Shuttle" - /datum/shuttle/autodock/overmap/hailstorm_shuttle name = "Spacer Militia Shuttle" move_time = 20 @@ -107,15 +106,7 @@ logging_home_tag = "nav_hailstorm_shuttle" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/hailstorm_shuttle/hangar - name = "Spacer Militia Shuttle Hangar" - landmark_tag = "nav_hailstorm_shuttle" - docking_controller = "hailstorm_shuttle_dock" - base_area = /area/space - base_turf = /turf/space - movable_flags = MOVABLE_FLAG_EFFECTMOVE - -/obj/effect/shuttle_landmark/hailstorm_shuttle/transit - name = "In transit" - landmark_tag = "nav_transit_hailstorm_shuttle" - base_turf = /turf/space/transit/north +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle + name = "Spacer Militia Shuttle" + shuttle_tag = "Spacer Militia Shuttle" + master_tag = "hailstorm_shuttle" diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm index e6fa0852087..7b3acbddb2a 100644 --- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm +++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm @@ -156,13 +156,10 @@ }, /area/hailstorm_ship) "at" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "hailstorm_shuttle_pump" - }, /obj/structure/lattice/catwalk/indoor, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -265,37 +262,24 @@ }, /area/hailstorm_ship) "aP" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "hailstorm_shuttle_pump" - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/structure/lattice/catwalk/indoor, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) "bb" = ( /obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "hailstorm_shuttle_out"; dir = 4 }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "hailstorm_shuttle"; - name = "exterior access button"; - pixel_y = -23; - req_access = list(214); - pixel_x = -8 - }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -343,20 +327,12 @@ }, /area/shuttle/hailstorm_shuttle) "bs" = ( -/obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "hailstorm_shuttle"; - name = "interior access button"; - pixel_x = -23; - pixel_y = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -690,6 +666,18 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"cS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "cW" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -744,6 +732,20 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck) +"dw" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/plating, +/area/hailstorm_ship/engine) "dE" = ( /obj/machinery/door/airlock/security{ name = "Gun Deck"; @@ -1069,12 +1071,6 @@ /turf/simulated/floor/tiled, /area/hailstorm_ship/engineering) "gw" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "hailstorm_dock_doors"; - dir = 4 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -1084,18 +1080,22 @@ name = "starboard, crew compartment" }, /obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "hailstorm_shuttle_out"; dir = 4 }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_y = 28; + dir = 8; + pixel_x = -10 + }, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) "gD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -1295,6 +1295,12 @@ /obj/machinery/power/apc/high/south{ req_access = list(214) }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1365,13 +1371,11 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "hailstorm_shuttle_sensor"; - req_access = list(214); - pixel_y = 25 - }, /obj/structure/lattice/catwalk/indoor, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + pixel_y = 20 + }, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -1416,11 +1420,6 @@ /area/hailstorm_ship/engine) "jE" = ( /obj/structure/lattice/catwalk/indoor, -/obj/machinery/airlock_sensor/airlock_exterior{ - frequency = 1380; - id_tag = "hailstorm_shuttle_exterior_sensor"; - pixel_y = -30 - }, /obj/structure/bed/handrail{ dir = 8 }, @@ -1457,6 +1456,12 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"jZ" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/template_noop, +/area/space) "ke" = ( /obj/effect/floor_decal/corner/black{ dir = 9 @@ -1511,7 +1516,7 @@ }, /area/hailstorm_ship/crew) "kr" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, /turf/simulated/floor/tiled{ @@ -1746,8 +1751,20 @@ }, /area/hailstorm_ship/gun_deck) "mH" = ( -/obj/effect/landmark/entry_point/aft, -/turf/simulated/wall/shuttle/space_ship/mercenary, +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/obj/effect/shuttle_landmark/hailstorm_ship/dock/aft, +/turf/simulated/floor/tiled/dark, /area/hailstorm_ship/engine) "mO" = ( /obj/structure/window/reinforced{ @@ -1759,7 +1776,9 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/shuttle_landmark/hailstorm_shuttle/hangar, +/obj/effect/shuttle_landmark/hailstorm_shuttle/hangar{ + dir = 8 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -1767,6 +1786,12 @@ "nd" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/crew) +"ne" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) "nj" = ( /obj/structure/cable/green{ d1 = 2; @@ -2009,6 +2034,10 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) +"pM" = ( +/obj/structure/sign/flag/dpra/large/north, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship) "qm" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ @@ -2065,6 +2094,13 @@ temperature = 278.15 }, /area/hailstorm_ship/gun_deck/second) +"qV" = ( +/obj/machinery/atmospherics/unary/engine, +/obj/effect/landmark/entry_point/aft{ + name = "aft engines, port" + }, +/turf/simulated/floor/airless, +/area/hailstorm_ship/engine) "re" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8; @@ -2372,6 +2408,26 @@ temperature = 278.15 }, /area/hailstorm_ship/engine) +"vY" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/template_noop, +/area/space) +"wi" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/plating, +/area/hailstorm_ship/engine) "wm" = ( /obj/machinery/pipedispenser/disposal, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -2672,7 +2728,6 @@ }, /area/hailstorm_ship/engineering) "CE" = ( -/obj/structure/sign/flag/dpra/large/north, /obj/effect/floor_decal/corner/black{ dir = 5 }, @@ -2770,7 +2825,6 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/eva) "DU" = ( -/obj/structure/sign/flag/dpra/large/north, /obj/effect/floor_decal/corner/black{ dir = 5 }, @@ -2901,6 +2955,24 @@ temperature = 278.15 }, /area/hailstorm_ship/atmospherics) +"EV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/hailstorm_ship/engine) +"Fe" = ( +/obj/machinery/door/airlock/external, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/tiled/dark, +/area/hailstorm_ship/engine) "Fx" = ( /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/warning{ @@ -2928,7 +3000,9 @@ }, /area/hailstorm_ship) "FD" = ( -/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav1, +/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav1{ + dir = 4 + }, /turf/template_noop, /area/space) "FU" = ( @@ -2963,11 +3037,21 @@ /turf/simulated/floor/airless, /area/shuttle/hailstorm_shuttle) "Gu" = ( -/obj/effect/map_effect/airlock/s_to_n/long/square, -/turf/simulated/wall/shuttle/space_ship/mercenary, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, /area/hailstorm_ship/engine) "GG" = ( -/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav3, +/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav3{ + dir = 1 + }, /turf/template_noop, /area/space) "GR" = ( @@ -3006,12 +3090,18 @@ /area/shuttle/hailstorm_shuttle) "GV" = ( /obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "hailstorm_shuttle_in"; dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/access_button{ + pixel_x = 10; + pixel_y = -28; + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -3046,13 +3136,8 @@ /turf/space/transit/north, /area/space) "Hs" = ( -/obj/machinery/light/small{ - brightness_color = "#FA8282"; - dir = 4 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/unary/engine, +/turf/simulated/floor/airless, /area/hailstorm_ship/engine) "Hu" = ( /obj/machinery/atmospherics/pipe/simple/visible, @@ -3222,12 +3307,19 @@ }, /area/hailstorm_ship/barracks) "JS" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/plating, /area/hailstorm_ship/engine) "Kd" = ( /obj/structure/cable/green{ @@ -3312,7 +3404,7 @@ }, /area/hailstorm_ship) "Ml" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, /turf/simulated/floor/plating{ @@ -3364,12 +3456,6 @@ }, /area/hailstorm_ship/engine) "Ni" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "hailstorm_shuttle_in"; - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, @@ -3378,6 +3464,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -3436,6 +3527,12 @@ "Oa" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship) +"Oy" = ( +/obj/effect/shuttle_landmark/hailstorm_shuttle/transit{ + dir = 8 + }, +/turf/space/transit/north, +/area/space) "Oz" = ( /obj/effect/floor_decal/corner/white/full{ dir = 8 @@ -3487,7 +3584,9 @@ }, /area/hailstorm_ship) "OM" = ( -/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav2, +/obj/effect/shuttle_landmark/nav_hailstorm_ship/nav2{ + dir = 8 + }, /turf/template_noop, /area/space) "OS" = ( @@ -3555,9 +3654,21 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/atmospherics) "PC" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/turf/simulated/floor/airless, +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = -25; + pixel_y = -10 + }, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/tiled/dark, /area/hailstorm_ship/engine) "PJ" = ( /obj/structure/table/rack, @@ -3584,10 +3695,6 @@ temperature = 278.15 }, /area/hailstorm_ship/engine) -"PW" = ( -/obj/effect/shuttle_landmark/hailstorm_shuttle/transit, -/turf/space/transit/north, -/area/space) "QL" = ( /obj/machinery/computer/ship/engines, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3637,12 +3744,15 @@ }, /area/hailstorm_ship/barracks) "Ry" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/obj/effect/landmark/entry_point/aft{ - name = "aft engines, port" +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/hailstorm_ship/engine) +"RA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating{ + temperature = 278.15 }, -/turf/simulated/floor/airless, /area/hailstorm_ship/engine) "Sf" = ( /obj/structure/cable/green{ @@ -3661,19 +3771,15 @@ }, /area/hailstorm_ship/armory) "Sg" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ - frequency = 1380; - id_tag = "hailstorm_shuttle"; - master_tag = "hailstorm_shuttle"; - tag_airpump = "hailstorm_shuttle_pump"; - tag_chamber_sensor = "hailstorm_shuttle_sensor"; - tag_exterior_door = "hailstorm_shuttle_out"; - tag_exterior_sensor = "hailstorm_shuttle_exterior_sensor"; - tag_interior_door = "hailstorm_shuttle_in"; - req_access = list(214); - pixel_y = -27 - }, /obj/structure/lattice/catwalk/indoor, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -20 + }, +/obj/effect/map_effect/marker/airlock/shuttle/hailstorm_shuttle, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -3686,6 +3792,15 @@ temperature = 278.15 }, /area/hailstorm_ship/engine) +"Sw" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/plating, +/area/hailstorm_ship/engine) "SK" = ( /obj/machinery/light{ dir = 4; @@ -3741,6 +3856,13 @@ temperature = 278.15 }, /area/hailstorm_ship/crew) +"Uh" = ( +/obj/machinery/atmospherics/unary/engine, +/obj/effect/landmark/entry_point/aft{ + name = "aft engines, starboard" + }, +/turf/simulated/floor/airless, +/area/hailstorm_ship/engine) "Uo" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -3792,12 +3914,11 @@ /turf/simulated/floor/reinforced/airless, /area/hailstorm_ship/gun_deck/second) "UW" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/obj/effect/landmark/entry_point/aft{ - name = "aft engines, starboard" +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 }, -/turf/simulated/floor/airless, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/plating, /area/hailstorm_ship/engine) "Vj" = ( /obj/effect/floor_decal/industrial/loading/yellow{ @@ -3945,18 +4066,33 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/hailstorm_ship/engineering) "WL" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, /area/shuttle/hailstorm_shuttle) +"WW" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/hailstorm_ship/dock/aft, +/turf/simulated/floor/tiled/dark, +/area/hailstorm_ship/engine) "WZ" = ( /obj/machinery/hologram/holopad/long_range, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3988,8 +4124,11 @@ }, /area/shuttle/hailstorm_shuttle) "Xx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating{ temperature = 278.15 @@ -4026,8 +4165,13 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -6181,7 +6325,7 @@ Hr Hr Hr Hr -Hr +Oy Hr Hr Hr @@ -6345,7 +6489,7 @@ Hr Hr Hr Hr -PW +Hr Hr Hr Hr @@ -10994,7 +11138,7 @@ iB iB iB iB -GG +iB iB iB iB @@ -12874,13 +13018,13 @@ iB iB iB iB +jZ iB iB +jZ iB iB -iB -iB -iB +jZ iB iB iB @@ -13206,7 +13350,7 @@ iB iB iB iB -iB +vY iB iB iB @@ -13531,7 +13675,7 @@ iB iB iB iB -iB +in in in in @@ -13692,9 +13836,9 @@ iB iB iB iB -iB -iB -PC +vY +Hs +Ry AP qy Nb @@ -13855,8 +13999,8 @@ iB iB iB iB -iB -UW +Uh +Ry Tt vU jG @@ -14017,8 +14161,8 @@ iB iB iB iB -iB -PC +Hs +Ry ZQ PT cr @@ -14178,12 +14322,12 @@ iB iB iB iB -iB -iB +vY +in +in in in in -Gu tC WG fv @@ -14340,13 +14484,13 @@ iB iB iB iB -iB -iB +in +in +UW +in +in cr cr -JS -cr -Xx WG VO Hm @@ -14502,13 +14646,13 @@ iB iB iB iB -iB -iB +mH +dw +Sw +PC +ne +EV cr -cr -cr -cr -gD WG la Hm @@ -14664,13 +14808,13 @@ iB iB iB iB -iB -iB -in -in -in -in +WW +JS +wi +Fe +cr gD +cr WG wm nj @@ -14826,13 +14970,13 @@ iB iB iB iB -iB -iB -iB -iB +in +in +in in nV Ml +cr WG gq IG @@ -14988,10 +15132,10 @@ iB iB iB iB +vY +iB iB iB -in -in in in tC @@ -15011,7 +15155,7 @@ rH rH kf rH -Oa +pM CE tE ag @@ -15152,11 +15296,11 @@ iB iB iB iB +iB +iB +iB in cr -cr -cW -cr Oa iU ph @@ -15210,7 +15354,7 @@ iB iB iB iB -iB +GG iB iB iB @@ -15314,10 +15458,10 @@ iB iB iB iB -mH -aH -kg -yj +iB +iB +iB +in YA vA cw @@ -15474,12 +15618,12 @@ iB iB iB iB +vY +iB +iB iB iB in -cr -cr -Sv iK Oa fm @@ -15497,7 +15641,7 @@ Wd Wx IK ij -Oa +pM DU tE OG @@ -15638,11 +15782,11 @@ iB iB iB iB +iB +iB in in -in -in -tC +Gu Oa Oa Oa @@ -15799,11 +15943,11 @@ iB iB iB iB -iB -iB -iB in -nV +in +in +in +in Xx in iB @@ -15960,13 +16104,13 @@ iB iB iB iB -iB -iB +vY in -in -in -Gu -gD +cr +cr +cW +cr +Xx in iB iB @@ -16123,12 +16267,12 @@ iB iB iB iB -iB -cr -cr -cr -cr -Ml +in +aH +kg +yj +RA +cS in iB Vw @@ -16276,19 +16420,19 @@ iB iB iB iB +jZ iB iB +jZ iB iB +jZ iB iB -iB -iB -iB -iB +in cr cr -Hs +Sv cr cr in @@ -16447,7 +16591,7 @@ iB iB iB iB -iB +in in in in @@ -16609,8 +16753,8 @@ iB iB iB iB -iB -PC +Hs +Ry vJ jB cr @@ -16771,7 +16915,7 @@ iB iB iB iB -iB +qV Ry Tt hd @@ -16933,8 +17077,8 @@ iB iB iB iB -iB -PC +Hs +Ry NC Ax DD @@ -17095,7 +17239,7 @@ iB iB iB iB -iB +in in in in diff --git a/maps/away/ships/golden_deep/golden_deep.dm b/maps/away/ships/golden_deep/golden_deep.dm index 766534fd43e..d16c0fcfe3e 100644 --- a/maps/away/ships/golden_deep/golden_deep.dm +++ b/maps/away/ships/golden_deep/golden_deep.dm @@ -7,7 +7,7 @@ spawn_weight = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/golden_deep) - sectors = list(SECTOR_HANEUNIM, ALL_TAU_CETI_SECTORS, ALL_COALITION_SECTORS) + sectors = list(ALL_TAU_CETI_SECTORS, ALL_COALITION_SECTORS) unit_test_groups = list(1) diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dm b/maps/away/ships/nka/nka_merchant/nka_merchant.dm index 67b159e5f58..024658735cb 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant.dm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dm @@ -106,15 +106,7 @@ logging_home_tag = "nav_nka_merchant_shuttle" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/nka_merchant_shuttle/hangar - name = "Her Majesty's Mercantile Flotilla Shuttle Hangar" - landmark_tag = "nav_nka_merchant_shuttle" - docking_controller = "nka_merchant_shuttle_dock" - base_area = /area/nka_merchant/hangar - base_turf = /turf/simulated/floor/plating - movable_flags = MOVABLE_FLAG_EFFECTMOVE - -/obj/effect/shuttle_landmark/nka_merchant_shuttle/transit - name = "In transit" - landmark_tag = "nav_transit_nka_merchant_shuttle" - base_turf = /turf/space/transit/north +/obj/effect/map_effect/marker/airlock/shuttle/nka_merchant_shuttle + name = "Her Majesty's Mercantile Flotilla Shuttle" + shuttle_tag = "Her Majesty's Mercantile Flotilla Shuttle" + master_tag = "nka_merchant_shuttle" diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm index 440810014c7..3b3e66bdcca 100644 --- a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm +++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm @@ -272,7 +272,7 @@ }, /area/nka_merchant/engineering) "aO" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor{ temperature = 278.15 }, @@ -379,21 +379,37 @@ }, /area/nka_merchant) "bg" = ( -/obj/machinery/light/small{ +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 10; + pixel_y = 32; + dir = 2 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ dir = 1 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/turf/simulated/floor/tiled/dark, /area/nka_merchant/eva) "bh" = ( -/obj/machinery/atmospherics/portables_connector{ - layer = 2.8 +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/nka_merchant_shuttle) "bj" = ( /obj/machinery/conveyor_switch{ @@ -504,22 +520,13 @@ }, /area/nka_merchant) "bI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/nka_merchant/eva) -"bJ" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/obj/effect/landmark/entry_point/north{ - name = "aft, engines" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/nka_merchant_shuttle) "bL" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/mechanical, @@ -533,17 +540,6 @@ temperature = 278.15 }, /area/nka_merchant/warehouse) -"bQ" = ( -/obj/structure/sign/flag/nka{ - pixel_y = 32 - }, -/obj/machinery/computer/shuttle_control/explore/nka_merchant_shuttle{ - dir = 4 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "bR" = ( /obj/machinery/computer/cryopod{ pixel_x = 32 @@ -560,16 +556,6 @@ temperature = 278.15 }, /area/nka_merchant/mess) -"bT" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/obj/effect/shuttle_landmark/nka_merchant_shuttle/hangar, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/nka_merchant/hangar) "bV" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -789,15 +775,6 @@ temperature = 278.15 }, /area/nka_merchant/engine) -"cs" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "cx" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1075,13 +1052,27 @@ temperature = 278.15 }, /area/nka_merchant/hangar) -"du" = ( -/obj/effect/map_effect/window_spawner/reinforced, -/obj/effect/landmark/entry_point/south{ - name = "fore, bridge" +"dr" = ( +/obj/machinery/atmospherics/portables_connector/fuel, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/fuel_port/hydrogen{ + pixel_y = 28; + pixel_x = 6 }, -/turf/simulated/wall/shuttle/space_ship, +/turf/simulated/floor/tiled/dark, /area/shuttle/nka_merchant_shuttle) +"du" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/shuttle_landmark/nka_merchant_shuttle/hangar{ + dir = 1 + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/nka_merchant/hangar) "dA" = ( /obj/machinery/light{ dir = 4 @@ -1170,12 +1161,40 @@ }, /area/nka_merchant/merchant) "dM" = ( -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/nka_merchant_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/nka_merchant_shuttle) "dN" = ( /obj/machinery/door/airlock/command{ @@ -1199,18 +1218,23 @@ }, /area/nka_merchant/captain_quarters) "dO" = ( -/obj/structure/sign/vacuum{ - pixel_x = -32 +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28; + pixel_x = 6 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/turf/simulated/floor/plating, /area/nka_merchant/eva) "dV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/engine) "dX" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -1426,20 +1450,16 @@ temperature = 278.15 }, /area/nka_merchant/warehouse) -"fc" = ( -/obj/machinery/recharger/wallcharger{ - pixel_y = 24 - }, -/turf/simulated/wall/shuttle/space_ship, -/area/shuttle/nka_merchant_shuttle) "fd" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/shuttle/black{ +/turf/simulated/floor/tiled{ temperature = 278.15 }, -/area/shuttle/nka_merchant_shuttle) +/area/nka_merchant/hangar) "fi" = ( /obj/structure/table/reinforced/steel, /obj/item/device/price_scanner, @@ -1451,7 +1471,9 @@ }, /area/nka_merchant/merchant) "fk" = ( -/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide{ start_pressure = 8000.63 }, @@ -1464,6 +1486,24 @@ temperature = 278.15 }, /area/nka_merchant/captain_quarters) +"fo" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/obj/effect/shuttle_landmark/nka_merchant/dock/starboard{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/nka_merchant/eva) "fq" = ( /obj/structure/extinguisher_cabinet/north, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1581,9 +1621,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 9 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/engine) "fI" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -1612,17 +1650,6 @@ temperature = 278.15 }, /area/nka_merchant/eva) -"fL" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/obj/machinery/meter, -/obj/structure/closet/crate/freezer/rations, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "fQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ req_access = list(213); @@ -1722,6 +1749,10 @@ temperature = 278.15 }, /area/nka_merchant/mess) +"gk" = ( +/obj/machinery/atmospherics/unary/engine, +/turf/simulated/floor/plating, +/area/shuttle/nka_merchant_shuttle) "gm" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/snacks/dirt_roast, @@ -1741,11 +1772,24 @@ }, /area/nka_merchant/warehouse) "gq" = ( -/obj/machinery/hologram/holopad/long_range, -/obj/effect/overmap/visitable/ship/landable/nka_merchant_shuttle, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/nka_merchant_shuttle) "gv" = ( /obj/structure/table/standard, @@ -1861,7 +1905,6 @@ /area/nka_merchant/eva) "hE" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /obj/effect/landmark/entry_point/aft, /turf/simulated/floor/plating{ temperature = 278.15 @@ -1992,7 +2035,9 @@ }, /area/nka_merchant/engineering) "in" = ( -/obj/effect/shuttle_landmark/nka_merchant/nav2, +/obj/effect/shuttle_landmark/nka_merchant/nav2{ + dir = 8 + }, /turf/template_noop, /area/space) "io" = ( @@ -2022,9 +2067,9 @@ }, /area/nka_merchant/hangar) "iu" = ( -/obj/effect/map_effect/airlock/e_to_w/long/square, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/wall/shuttle/space_ship, -/area/nka_merchant/engineering) +/area/shuttle/nka_merchant_shuttle) "iv" = ( /obj/effect/step_trigger/teleporter, /obj/effect/step_trigger/teleporter, @@ -2064,17 +2109,6 @@ "iB" = ( /turf/template_noop, /area/space) -"iF" = ( -/obj/machinery/light/small/emergency{ - dir = 4 - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "iK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -2178,17 +2212,6 @@ temperature = 278.15 }, /area/nka_merchant) -"jg" = ( -/obj/structure/fuel_port/phoron{ - pixel_x = -32 - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "ji" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/corner/brown{ @@ -2272,7 +2295,7 @@ }, /area/nka_merchant) "jw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, /turf/simulated/floor/plating{ @@ -2293,6 +2316,10 @@ temperature = 278.15 }, /area/nka_merchant/eva) +"jB" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/template_noop, +/area/space) "jE" = ( /obj/structure/table/standard, /obj/item/toy/comic/azmarian/issue_4, @@ -2328,6 +2355,15 @@ temperature = 278.15 }, /area/nka_merchant/warehouse) +"jK" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/turf/simulated/floor/plating, +/area/nka_merchant/eva) "jU" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2369,19 +2405,8 @@ temperature = 278.15 }, /area/nka_merchant/mess) -"ke" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "nka_merchant_shuttle_out"; - dir = 4 - }, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "kf" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 8; id = "merchant_navy_bridge" @@ -2470,7 +2495,9 @@ }, /area/nka_merchant/engine) "kz" = ( -/obj/effect/shuttle_landmark/nka_merchant/nav1, +/obj/effect/shuttle_landmark/nka_merchant/nav1{ + dir = 4 + }, /turf/template_noop, /area/space) "kA" = ( @@ -2509,12 +2536,27 @@ }, /area/nka_merchant/engineering) "kE" = ( -/obj/machinery/computer/ship/helm{ - req_access = null +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/nka_merchant_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/nka_merchant_shuttle) "kF" = ( /obj/effect/floor_decal/corner/dark_blue/full{ @@ -2598,21 +2640,6 @@ temperature = 278.15 }, /area/nka_merchant/barracks) -"kU" = ( -/obj/machinery/shipsensors/weak, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "kV" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -2646,9 +2673,12 @@ }, /area/nka_merchant/merchant) "le" = ( -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/nka_merchant_shuttle) "lh" = ( /obj/structure/closet/cabinet, @@ -2950,15 +2980,6 @@ temperature = 278.15 }, /area/nka_merchant/bridge) -"nh" = ( -/obj/structure/extinguisher_cabinet/west, -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "ni" = ( /obj/structure/table/standard, /obj/item/storage/toolbox/mechanical, @@ -2966,23 +2987,6 @@ temperature = 278.15 }, /area/nka_merchant/hangar) -"nl" = ( -/obj/machinery/vending/wallmed1{ - name = "Medical Supplies"; - pixel_x = -26; - pixel_y = -1; - req_access = null - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/structure/table/steel, -/obj/item/storage/bag/inflatable, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "nq" = ( /obj/machinery/door/window/eastright{ dir = 2; @@ -3031,6 +3035,11 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -3075,11 +3084,13 @@ }, /area/nka_merchant/barracks) "oh" = ( -/turf/unsimulated/wall/fakepdoor, +/obj/machinery/door/blast/regular, +/turf/simulated/floor{ + temperature = 278.15 + }, /area/nka_merchant/hangar) "ol" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /obj/effect/landmark/entry_point/aft{ name = "aft engines, port" }, @@ -3104,6 +3115,17 @@ temperature = 278.15 }, /area/nka_merchant/captain_quarters) +"oR" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/east{ + req_access = null + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "oT" = ( /obj/structure/cable/green{ d1 = 2; @@ -3128,16 +3150,20 @@ temperature = 278.15 }, /area/nka_merchant/mess) -"pg" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/wall/shuttle/space_ship, -/area/shuttle/nka_merchant_shuttle) "pi" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + icon_state = "warning" }, -/turf/unsimulated/floor/plating, -/area/shuttle/nka_merchant_shuttle) +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/nka_merchant/hangar) "pj" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 1 @@ -3214,6 +3240,10 @@ temperature = 278.15 }, /area/nka_merchant/engineering) +"qD" = ( +/obj/effect/landmark/entry_point/port, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/nka_merchant_shuttle) "qK" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -3222,15 +3252,6 @@ temperature = 278.15 }, /area/nka_merchant/engineering) -"qV" = ( -/obj/machinery/recharger/wallcharger{ - pixel_y = 24 - }, -/obj/effect/landmark/entry_point/west{ - name = "starboard, crew compartment" - }, -/turf/simulated/wall/shuttle/space_ship, -/area/shuttle/nka_merchant_shuttle) "qY" = ( /obj/structure/bed/stool/bar/padded/red, /turf/simulated/floor/tiled{ @@ -3279,6 +3300,11 @@ temperature = 278.15 }, /area/nka_merchant/mess) +"sk" = ( +/obj/machinery/atmospherics/binary/pump/fuel/on, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "sn" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -3291,15 +3317,30 @@ temperature = 278.15 }, /area/nka_merchant/eva) -"sX" = ( -/obj/structure/closet/walllocker/emerglocker/west, +"sB" = ( /obj/structure/bed/stool/chair/shuttle{ dir = 4 }, -/turf/simulated/floor/shuttle/black{ +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) +"sX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4; + icon_state = "warning" + }, +/turf/simulated/floor{ temperature = 278.15 }, -/area/shuttle/nka_merchant_shuttle) +/area/nka_merchant/hangar) +"tl" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/template_noop, +/area/space) "tw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ @@ -3379,13 +3420,55 @@ temperature = 278.15 }, /area/nka_merchant/captain_quarters) +"uG" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/turf/simulated/floor/plating, +/area/nka_merchant/eva) +"uK" = ( +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/nka_merchant/hangar) +"vi" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 2; + pixel_y = 28; + pixel_x = -6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/turf/simulated/floor/plating, +/area/nka_merchant/eva) "vo" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/nka_merchant/engine) +"vv" = ( +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE"; + frame_color = "#BDB6AE"; + spawn_firedoor = 1; + spawn_grille = 1 + }, +/obj/effect/landmark/entry_point/fore, +/turf/simulated/floor/plating, +/area/shuttle/nka_merchant_shuttle) "vA" = ( /turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/eva) @@ -3426,6 +3509,26 @@ temperature = 278.15 }, /area/nka_merchant/eva) +"wi" = ( +/obj/machinery/computer/ship/navigation/terminal{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) +"wj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "wm" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -3456,6 +3559,12 @@ temperature = 278.15 }, /area/nka_merchant/hangar) +"wx" = ( +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "wP" = ( /obj/effect/floor_decal/corner/dark_blue/full, /turf/simulated/floor/tiled{ @@ -3492,6 +3601,18 @@ temperature = 278.15 }, /area/nka_merchant/warehouse) +"wX" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/nka_merchant_shuttle) +"wY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/nka_merchant_shuttle) "xc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3581,6 +3702,12 @@ temperature = 278.15 }, /area/nka_merchant/warehouse) +"yp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/nka_merchant_shuttle) "yr" = ( /obj/structure/bed/padded, /obj/item/bedsheet/blue, @@ -3647,6 +3774,10 @@ temperature = 278.15 }, /area/nka_merchant/hangar) +"zx" = ( +/obj/effect/landmark/entry_point/starboard, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/nka_merchant_shuttle) "zY" = ( /obj/machinery/door/airlock/command{ req_access = list(213); @@ -3739,6 +3870,21 @@ }, /turf/simulated/wall/shuttle/space_ship, /area/nka_merchant) +"Co" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/shipsensors/weak{ + pixel_y = 4; + pixel_x = -1 + }, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/shuttle/nka_merchant_shuttle) "Df" = ( /turf/simulated/wall/shuttle/space_ship, /area/shuttle/nka_merchant_shuttle) @@ -3784,7 +3930,7 @@ }, /area/nka_merchant/merchant) "DU" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor{ temperature = 278.15 }, @@ -3884,6 +4030,15 @@ temperature = 278.15 }, /area/nka_merchant/mess) +"EQ" = ( +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE"; + frame_color = "#BDB6AE"; + spawn_firedoor = 1; + spawn_grille = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/nka_merchant_shuttle) "EU" = ( /obj/machinery/light, /turf/simulated/floor/tiled{ @@ -3917,9 +4072,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/black{ dir = 4 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/engine) "FC" = ( /obj/effect/floor_decal/corner/brown, @@ -3932,6 +4085,18 @@ temperature = 278.15 }, /area/nka_merchant/merchant) +"FG" = ( +/obj/machinery/computer/ship/engines/terminal{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "FH" = ( /obj/machinery/light{ dir = 4 @@ -3953,6 +4118,28 @@ temperature = 278.15 }, /area/nka_merchant/captain_quarters) +"FV" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/iff_beacon{ + pixel_y = 4 + }, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/shuttle/nka_merchant_shuttle) +"FW" = ( +/obj/machinery/power/smes/buildable/third_party_shuttle, +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "Gj" = ( /obj/machinery/iff_beacon, /obj/structure/railing/mapped{ @@ -3974,7 +4161,9 @@ }, /area/nka_merchant/merchant) "GG" = ( -/obj/effect/shuttle_landmark/nka_merchant/nav3, +/obj/effect/shuttle_landmark/nka_merchant/nav3{ + dir = 1 + }, /turf/template_noop, /area/space) "GP" = ( @@ -3998,6 +4187,16 @@ temperature = 278.15 }, /area/nka_merchant/engineering) +"Hg" = ( +/obj/machinery/hologram/holopad/long_range, +/obj/effect/overmap/visitable/ship/landable/nka_merchant_shuttle, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/nka_merchant_shuttle) "Hr" = ( /turf/space/transit/north, /area/space) @@ -4028,8 +4227,35 @@ temperature = 278.15 }, /area/nka_merchant) +"HT" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = 28; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/turf/simulated/floor/tiled/dark, +/area/nka_merchant/eva) +"HZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "IA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -4074,6 +4300,24 @@ temperature = 278.15 }, /area/nka_merchant/warehouse) +"Jo" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/crate/internals, +/obj/item/storage/bag/inflatable, +/obj/item/device/oxycandle, +/obj/item/tank/emergency_oxygen{ + pixel_x = 5 + }, +/obj/item/tank/emergency_oxygen/engi{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "Jv" = ( /obj/item/device/radio, /obj/item/device/radio, @@ -4146,6 +4390,12 @@ temperature = 278.15 }, /area/nka_merchant/mess) +"Ki" = ( +/obj/machinery/computer/ship/helm/terminal{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "KB" = ( /obj/machinery/shipsensors/weak, /obj/structure/railing/mapped{ @@ -4162,8 +4412,18 @@ /obj/effect/landmark/entry_point/port{ name = "port, hangar" }, -/turf/unsimulated/wall/fakepdoor, +/obj/machinery/door/blast/regular, +/turf/simulated/floor{ + temperature = 278.15 + }, /area/nka_merchant/hangar) +"KS" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "KT" = ( /obj/machinery/vending/dinnerware, /turf/simulated/floor/lino/diamond{ @@ -4187,22 +4447,6 @@ }, /turf/template_noop, /area/space) -"LV" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nka_merchant_shuttle"; - name = "Port docking controller"; - pixel_x = 6; - pixel_y = 28; - tag_door = "nka_merchant_shuttle_out" - }, -/obj/machinery/computer/ship/sensors{ - dir = 8 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "MA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4211,6 +4455,19 @@ temperature = 278.15 }, /area/nka_merchant/captain_quarters) +"MB" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/nka_merchant/eva) "Ni" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/binary/pump/on{ @@ -4254,6 +4511,16 @@ temperature = 278.15 }, /area/nka_merchant/hangar) +"Ns" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/machinery/alarm/east{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "NJ" = ( /obj/machinery/light{ dir = 1 @@ -4342,6 +4609,18 @@ temperature = 278.15 }, /area/nka_merchant/engine) +"OP" = ( +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/structure/sign/flag/nka{ + pixel_y = -32 + }, +/obj/machinery/computer/shuttle_control/explore/nka_merchant_shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "OT" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -4351,6 +4630,19 @@ temperature = 278.15 }, /area/nka_merchant) +"OX" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/black, +/turf/simulated/wall/shuttle/space_ship, +/area/nka_merchant/engine) +"OZ" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating{ + temperature = 278.15 + }, +/area/nka_merchant/eva) "Pb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4; @@ -4361,12 +4653,6 @@ temperature = 278.15 }, /area/nka_merchant/engineering) -"Pg" = ( -/obj/machinery/atmospherics/binary/pump/high_power, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "PJ" = ( /obj/structure/toilet{ dir = 4 @@ -4495,20 +4781,6 @@ temperature = 278.15 }, /area/nka_merchant/bridge) -"Tt" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "nka_merchant_shuttle_out"; - dir = 4 - }, -/obj/effect/landmark/entry_point/east{ - name = "port, crew compartment" - }, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/shuttle/nka_merchant_shuttle) "Tu" = ( /obj/effect/floor_decal/industrial/outline/security, /obj/structure/closet/secure_closet/guncabinet{ @@ -4531,9 +4803,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/black{ dir = 8 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/engine) "TH" = ( /turf/simulated/wall/shuttle/space_ship, @@ -4550,6 +4820,10 @@ temperature = 278.15 }, /area/nka_merchant/mess) +"TT" = ( +/obj/effect/landmark/entry_point/aft, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/nka_merchant_shuttle) "TU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black{ dir = 1 @@ -4560,11 +4834,11 @@ }, /area/nka_merchant/engine) "Up" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/item/clothing/head/cone, /turf/simulated/floor{ temperature = 278.15 }, @@ -4591,6 +4865,12 @@ temperature = 278.15 }, /area/nka_merchant) +"UK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 5 + }, +/turf/simulated/wall/shuttle/space_ship, +/area/nka_merchant/engine) "UL" = ( /turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/bridge/secondary) @@ -4600,6 +4880,15 @@ }, /turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/engineering) +"Va" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "Vj" = ( /turf/simulated/wall/shuttle/space_ship, /area/nka_merchant/mess) @@ -4607,7 +4896,7 @@ /turf/simulated/wall/shuttle/space_ship, /area/nka_merchant) "Vv" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 8; id = "merchant_navy_bridge" @@ -4616,6 +4905,12 @@ temperature = 278.15 }, /area/nka_merchant/bridge) +"VT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/nka_merchant_shuttle) "Wl" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4730,23 +5025,44 @@ temperature = 278.15 }, /area/nka_merchant/barracks) -"YM" = ( -/obj/machinery/iff_beacon, -/obj/structure/railing/mapped{ +"Yq" = ( +/obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/structure/railing/mapped{ - dir = 1 +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 }, -/obj/structure/railing/mapped{ - dir = 4 +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) +"Yx" = ( +/obj/machinery/computer/ship/sensors/terminal{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 }, -/turf/simulated/floor{ - temperature = 278.15 +/obj/structure/sign/flag/nka{ + pixel_y = -32 }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) +"YM" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/nka_merchant_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/nka_merchant_shuttle) "YT" = ( /obj/machinery/firealarm/east, @@ -4761,9 +5077,12 @@ temperature = 278.15 }, /area/nka_merchant/engineering) +"YU" = ( +/obj/structure/bed/stool/chair/shuttle, +/turf/simulated/floor/tiled/dark, +/area/shuttle/nka_merchant_shuttle) "YX" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /obj/effect/landmark/entry_point/aft{ name = "aft engines, starboard" }, @@ -9211,7 +9530,7 @@ iB iB iB iB -iB +kz iB iB iB @@ -11685,7 +12004,7 @@ iB iB iB iB -GG +iB iB iB iB @@ -12617,7 +12936,7 @@ iB iB iB iB -kz +iB iB iB iB @@ -14383,6 +14702,7 @@ iB iB iB iB +jB iB iB iB @@ -14403,8 +14723,7 @@ iB iB iB iB -iB -iB +jB iB iB iB @@ -14869,6 +15188,7 @@ iB iB iB iB +jB iB iB iB @@ -14889,8 +15209,7 @@ iB iB iB iB -iB -iB +jB iB iB iB @@ -15355,6 +15674,7 @@ iB iB iB iB +jB iB iB iB @@ -15375,8 +15695,7 @@ iB iB iB iB -iB -iB +jB iB iB iB @@ -15681,24 +16000,24 @@ iB iB iB iB +tl iB iB +tl iB iB +tl +vA +HT +fo +vA +tl iB iB +tl iB iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB +tl iB iB iB @@ -15850,10 +16169,10 @@ AT AT iB iB -iB -iB -iB -iB +vA +dO +uG +vA iB iB iB @@ -16006,16 +16325,16 @@ iB iB iB vo -RS +UK Zr AT AT AT vA vA -Wx -Wx -iu +vi +jK +pA pA pA UT @@ -16176,7 +16495,7 @@ AT jA vA bg -Wx +MB pA cS gN @@ -16338,7 +16657,7 @@ AT jA vA Wx -Wx +bI pA lZ mv @@ -16500,7 +16819,7 @@ AT vA vA Wx -Wx +OZ pA dI Ew @@ -16660,7 +16979,7 @@ Zr Zr AT hx -dO +Wx Wx bI pA @@ -17370,7 +17689,7 @@ iB iB iB iB -iB +GG iB iB iB @@ -17788,7 +18107,7 @@ iB iB iB vo -RS +UK aI gh iY @@ -17950,7 +18269,7 @@ iB iB iB hE -kx +OX kx am iY @@ -18443,7 +18762,7 @@ OL cG Nq yc -yc +fd yc yc yc @@ -18605,15 +18924,15 @@ jn AT iU bF +pi kA -kA -kA -Up -bT -kA -Up -kA -kA +Df +Df +Df +EQ +zx +Df +FV kA kA lL @@ -18766,18 +19085,18 @@ Zr Ll AT fq -YM -Df -Df -Df -Df -Tt -ke -Df -Df -Df +ht +Up +gk +VT +dr +sk +KS +Jo Df +EQ Df +uK iZ yc yc @@ -18929,17 +19248,17 @@ jn AT hf ht +Up +Df +wX +iu +wj +HZ +sB +FG +OP Df Df -bQ -nh -le -le -sX -jg -nl -pg -pi iZ yc it @@ -19094,14 +19413,14 @@ ht du kE dM -le +YM gq le -le -le -cs -pg -bJ +Hg +YU +YU +Ki +vv iZ pj kr @@ -19253,17 +19572,17 @@ zi AT iU ht +uK +TT +yp Df -Df -LV -fd -iF -fd +Va +Yq bh -Pg -fL -pg -pi +wi +Yx +Df +Df iZ yc bj @@ -19414,18 +19733,18 @@ Zr Zr AT iU -kU -Df -Df -Df -Df -Df -qV -fc -Df -Df +ht +uK +gk +wY +wx +Ns +oR +FW Df +EQ Df +uK iZ yc mj @@ -19578,16 +19897,16 @@ AT hf zm cl -cl -cl -cl -cl -cl -cl -cl -cl -cl -cl +sX +Df +Df +Df +Df +qD +Df +Co +sX +sX jy yc mj diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant_landmarks.dm b/maps/away/ships/nka/nka_merchant/nka_merchant_landmarks.dm new file mode 100644 index 00000000000..14f2f9a10ed --- /dev/null +++ b/maps/away/ships/nka/nka_merchant/nka_merchant_landmarks.dm @@ -0,0 +1,34 @@ +// --------------------- base type + +/obj/effect/shuttle_landmark/nka_merchant + base_area = /area/space + base_turf = /turf/space + +// --------------------- shuttle + +/obj/effect/shuttle_landmark/nka_merchant_shuttle/hangar + name = "Her Majesty's Mercantile Flotilla Shuttle Hangar" + landmark_tag = "nav_nka_merchant_shuttle" + docking_controller = "nka_merchant_shuttle_dock" + base_area = /area/nka_merchant/hangar + base_turf = /turf/simulated/floor/plating + movable_flags = MOVABLE_FLAG_EFFECTMOVE + +// ---- + +/obj/effect/shuttle_landmark/nka_merchant_shuttle/transit + name = "In transit" + landmark_tag = "nav_transit_nka_merchant_shuttle" + base_turf = /turf/space/transit/north + +// --------------------- docks + +/obj/effect/shuttle_landmark/nka_merchant/dock/starboard + name = "Dock, Starboard" + landmark_tag = "nav_nka_merchant_dock_starboard" + docking_controller = "airlock_nka_merchant_dock_starboard" + +/obj/effect/map_effect/marker/airlock/docking/nka_merchant/dock/starboard + name = "Dock, Starboard" + landmark_tag = "nav_nka_merchant_dock_starboard" + master_tag = "airlock_nka_merchant_dock_starboard" diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dm b/maps/away/ships/pra/database_freighter/database_freighter.dm index 58960308263..13db06315d5 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dm @@ -111,15 +111,7 @@ logging_home_tag = "nav_database_freighter_shuttle" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/database_freighter_shuttle/hangar - name = "Database Freighter Shuttle Hangar" - landmark_tag = "nav_database_freighter_shuttle" - docking_controller = "database_freighter_shuttle_dock" - base_area = /area/database_freighter/hangar - base_turf = /turf/simulated/floor/plating - movable_flags = MOVABLE_FLAG_EFFECTMOVE - -/obj/effect/shuttle_landmark/database_freighter_shuttle/transit - name = "In transit" - landmark_tag = "nav_transit_database_freighter_shuttle" - base_turf = /turf/space/transit/north +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle + name = "Database Freighter Shuttle" + shuttle_tag = "Database Freighter Shuttle" + master_tag = "nav_database_freighter_shuttle" diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm index 7673ff43294..9a535459c21 100644 --- a/maps/away/ships/pra/database_freighter/database_freighter.dmm +++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm @@ -46,13 +46,9 @@ }, /area/database_freighter/bridge) "aj" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/obj/effect/landmark/entry_point/north{ - name = "aft, engines" - }, -/turf/unsimulated/floor/plating, +/obj/effect/landmark/entry_point/fore, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/turf/simulated/floor/plating, /area/shuttle/database_freighter_shuttle) "al" = ( /obj/machinery/atmospherics/pipe/tank{ @@ -89,10 +85,27 @@ }, /area/database_freighter/captain_quarters) "at" = ( -/obj/machinery/computer/ship/helm{ - req_access = null +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 }, -/turf/simulated/floor/shuttle/black, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "au" = ( /obj/effect/step_trigger/teleporter, @@ -237,7 +250,10 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/turf/simulated/floor/shuttle/black, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "aV" = ( /obj/machinery/computer/ship/navigation{ @@ -253,7 +269,9 @@ /area/database_freighter/bridge) "aX" = ( /obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor, +/turf/simulated/floor{ + temperature = 278.15 + }, /area/database_freighter/hangar) "aY" = ( /obj/structure/bed/padded, @@ -264,10 +282,40 @@ }, /area/database_freighter/barracks) "bb" = ( -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ dir = 1 }, -/turf/simulated/floor/shuttle/black, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/database_freighter_shuttle) "bd" = ( /obj/structure/closet/walllocker/medical{ @@ -306,7 +354,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/turf/simulated/floor, +/turf/simulated/floor{ + temperature = 278.15 + }, /area/database_freighter/hangar) "br" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -484,16 +534,9 @@ }, /area/database_freighter/laboratory) "ce" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "database_freighter_shuttle_out"; - dir = 4 - }, -/obj/effect/landmark/entry_point/east{ - name = "port, crew compartment" - }, -/turf/simulated/floor, +/obj/machinery/atmospherics/binary/pump/fuel/on, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "cf" = ( /obj/effect/floor_decal/corner/red{ @@ -635,10 +678,12 @@ /turf/template_noop, /area/space) "cF" = ( -/obj/machinery/recharger/wallcharger{ - pixel_y = 24 +/obj/machinery/power/smes/buildable/third_party_shuttle, +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/wall/shuttle/raider, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "cG" = ( /obj/structure/table/standard, @@ -695,13 +740,24 @@ }, /area/database_freighter/captain_quarters) "cM" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ dir = 4 }, -/turf/simulated/floor, -/area/database_freighter/hangar) +/obj/machinery/shipsensors/weak{ + pixel_y = 4; + pixel_x = -1 + }, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/shuttle/database_freighter_shuttle) "cP" = ( -/obj/effect/shuttle_landmark/nav_database_freighter/nav2, +/obj/effect/shuttle_landmark/nav_database_freighter/nav2{ + dir = 1 + }, /turf/template_noop, /area/space) "cS" = ( @@ -734,7 +790,9 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -782,11 +840,13 @@ }, /area/database_freighter/storage) "dn" = ( -/obj/structure/closet/walllocker/emerglocker/west, /obj/structure/bed/stool/chair/shuttle{ dir = 4 }, -/turf/simulated/floor/shuttle/black, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "ds" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -823,13 +883,10 @@ }, /area/database_freighter/laboratory) "dz" = ( -/obj/structure/sign/flag/pra{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 }, -/obj/machinery/computer/shuttle_control/explore/database_freighter_shuttle{ - dir = 4 - }, -/turf/simulated/floor/shuttle/black, +/turf/simulated/wall/shuttle/raider, /area/shuttle/database_freighter_shuttle) "dA" = ( /obj/effect/floor_decal/industrial/warning, @@ -950,19 +1007,16 @@ }, /area/database_freighter/engineering) "dZ" = ( -/obj/machinery/vending/wallmed1{ - name = "Medical Supplies"; - pixel_x = -26; - pixel_y = -1; - req_access = null +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 +/obj/structure/sign/flag/pra{ + pixel_y = -32 }, -/obj/structure/table/steel, -/obj/item/storage/bag/inflatable, -/turf/simulated/floor/shuttle/black, +/obj/machinery/computer/shuttle_control/explore/database_freighter_shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "ef" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -987,11 +1041,8 @@ }, /area/database_freighter/bridge) "ej" = ( -/obj/structure/extinguisher_cabinet/west, -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/turf/simulated/floor/shuttle/black, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/shuttle/raider, /area/shuttle/database_freighter_shuttle) "eo" = ( /obj/effect/floor_decal/corner/red{ @@ -1012,11 +1063,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/machinery/light{ - dir = 4; - status = 2 +/turf/simulated/floor{ + temperature = 278.15 }, -/turf/simulated/floor, /area/database_freighter/hangar) "ew" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -1086,6 +1135,16 @@ temperature = 278.15 }, /area/database_freighter/laboratory) +"eU" = ( +/obj/machinery/atmospherics/portables_connector/fuel, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/fuel_port/hydrogen{ + pixel_y = 28; + pixel_x = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/database_freighter_shuttle) "eX" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -1106,13 +1165,11 @@ }, /area/database_freighter) "eZ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 }, -/obj/effect/shuttle_landmark/database_freighter_shuttle/hangar, -/turf/simulated/floor, -/area/database_freighter/hangar) +/turf/simulated/wall/shuttle/raider, +/area/database_freighter/engine) "fa" = ( /obj/structure/table/standard, /obj/item/paper_bin, @@ -1175,8 +1232,21 @@ }, /area/database_freighter/engineering) "fm" = ( -/obj/effect/map_effect/airlock/s_to_n/long/square/wide, -/turf/simulated/wall/shuttle/raider, +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 20; + pixel_y = -28; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, +/turf/simulated/floor{ + temperature = 278.15 + }, /area/database_freighter/engine) "fo" = ( /obj/machinery/meter, @@ -1304,13 +1374,9 @@ }, /area/database_freighter/hangar) "fV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/obj/item/clothing/head/cone, -/turf/simulated/floor, -/area/database_freighter/hangar) +/obj/effect/landmark/entry_point/starboard, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "fZ" = ( /obj/machinery/door/airlock/command{ req_access = list(209); @@ -1322,6 +1388,18 @@ temperature = 278.15 }, /area/database_freighter/bridge) +"ga" = ( +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/engine) "gb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 @@ -1385,7 +1463,6 @@ /area/database_freighter/storage) "gn" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /turf/simulated/floor/airless, /area/database_freighter/engine) "gu" = ( @@ -1436,6 +1513,12 @@ temperature = 278.15 }, /area/database_freighter) +"gx" = ( +/obj/effect/shuttle_landmark/database_freighter_shuttle/transit{ + dir = 1 + }, +/turf/space/transit/north, +/area/space) "gB" = ( /obj/effect/floor_decal/corner/red/full, /obj/machinery/vending/cigarette, @@ -1472,8 +1555,13 @@ }, /area/database_freighter/engineering) "gQ" = ( -/turf/unsimulated/wall/fakepdoor, -/area/database_freighter/hangar) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/database_freighter_shuttle) "gT" = ( /obj/structure/sign/vacuum{ pixel_x = 32 @@ -1586,7 +1674,9 @@ dir = 9; icon_state = "warning" }, -/turf/simulated/floor, +/turf/simulated/floor{ + temperature = 278.15 + }, /area/database_freighter/hangar) "hA" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ @@ -1653,15 +1743,9 @@ }, /area/database_freighter) "hO" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4; - status = 2 - }, -/turf/simulated/floor, -/area/database_freighter/hangar) +/obj/effect/landmark/entry_point/port, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "hS" = ( /obj/machinery/door/airlock/command{ req_access = list(209); @@ -1681,7 +1765,14 @@ }, /area/database_freighter/bridge) "hT" = ( -/turf/simulated/floor/shuttle/black, +/obj/machinery/hologram/holopad/long_range, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/overmap/visitable/ship/landable/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/database_freighter_shuttle) "hW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -1760,11 +1851,15 @@ }, /area/database_freighter/laboratory) "in" = ( -/obj/effect/map_effect/window_spawner/reinforced, -/obj/effect/landmark/entry_point/south{ - name = "fore, bridge" +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/shuttle_landmark/database_freighter_shuttle/hangar{ + dir = 1 + }, +/turf/simulated/floor{ + temperature = 278.15 }, -/turf/simulated/floor/plating, /area/shuttle/database_freighter_shuttle) "iv" = ( /obj/effect/step_trigger/teleporter, @@ -1796,13 +1891,11 @@ }, /area/database_freighter) "iJ" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "database_freighter_shuttle_out"; - dir = 4 +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "iK" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -1857,13 +1950,22 @@ }, /area/database_freighter/laboratory) "jg" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 }, -/obj/structure/sign/painting_frame/hadii{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/shuttle/black, +/obj/effect/map_effect/marker/airlock/shuttle/database_freighter_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "ji" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, @@ -1900,13 +2002,16 @@ }, /area/database_freighter/engineering) "jv" = ( -/obj/structure/fuel_port/phoron{ - pixel_x = -32 - }, -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/computer/ship/engines/terminal{ dir = 4 }, -/turf/simulated/floor/shuttle/black, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "jw" = ( /obj/structure/table/rack, @@ -1927,7 +2032,7 @@ }, /area/database_freighter/engineering) "jJ" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 2; id = "database_bridge" @@ -1960,9 +2065,18 @@ }, /area/database_freighter/bridge) "jV" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, /turf/simulated/floor{ temperature = 278.15 }, @@ -2079,9 +2193,6 @@ /turf/template_noop, /area/space) "kz" = ( -/obj/structure/sign/vacuum{ - pixel_x = 32 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10; pixel_y = 0 @@ -2158,17 +2269,23 @@ }, /area/database_freighter/engineering) "kR" = ( -/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, /turf/simulated/floor{ temperature = 278.15 }, /area/database_freighter/engine) "kS" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/turf/simulated/floor{ + temperature = 278.15 }, -/turf/unsimulated/floor/plating, -/area/shuttle/database_freighter_shuttle) +/area/database_freighter/hangar) "kU" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -2210,10 +2327,34 @@ temperature = 278.15 }, /area/database_freighter/laboratory) +"lq" = ( +/obj/effect/landmark/entry_point/port{ + name = "port, hangar" + }, +/obj/machinery/door/blast/regular, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "ls" = ( -/obj/machinery/hologram/holopad/long_range, -/obj/effect/overmap/visitable/ship/landable/database_freighter_shuttle, -/turf/simulated/floor/shuttle/black, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "lt" = ( /obj/effect/floor_decal/plaque, @@ -2229,7 +2370,7 @@ }, /area/database_freighter) "lv" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2285,6 +2426,12 @@ temperature = 278.15 }, /area/database_freighter) +"lM" = ( +/obj/effect/landmark/entry_point/aft{ + name = "aft, dock" + }, +/turf/simulated/wall/shuttle/raider, +/area/database_freighter/engine) "lO" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -2372,7 +2519,7 @@ }, /area/database_freighter) "mk" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/machinery/door/blast/regular/open{ dir = 4; id = "database_bridge" @@ -2404,7 +2551,7 @@ }, /area/database_freighter/barracks) "mr" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" }, @@ -2480,26 +2627,33 @@ }, /area/database_freighter) "mF" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/wall/shuttle/raider, +/obj/machinery/computer/ship/helm/terminal{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "mR" = ( -/obj/machinery/recharger/wallcharger{ - pixel_y = 24 +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/landmark/entry_point/west{ - name = "starboard, crew compartment" +/obj/machinery/power/apc/east{ + req_access = null }, -/turf/simulated/wall/shuttle/raider, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "nd" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 +/obj/machinery/computer/ship/sensors/terminal{ + dir = 8 }, -/obj/machinery/meter, -/obj/structure/closet/crate/freezer/rations, -/turf/simulated/floor/shuttle/black, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/obj/structure/sign/flag/pra{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "ng" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -2528,12 +2682,9 @@ }, /area/database_freighter/laboratory) "nq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8; - icon_state = "warning" - }, -/turf/simulated/floor, -/area/database_freighter/hangar) +/obj/effect/map_effect/window_spawner/full/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/database_freighter_shuttle) "nr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2602,6 +2753,24 @@ temperature = 278.15 }, /area/database_freighter/checkpoint) +"nE" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, +/obj/effect/shuttle_landmark/database_freighter/dock/aft, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/engine) "nY" = ( /obj/structure/bed/padded, /obj/item/bedsheet/brown, @@ -2646,6 +2815,20 @@ temperature = 278.15 }, /area/database_freighter/laboratory) +"oF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/machinery/alarm/east{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/database_freighter_shuttle) +"oI" = ( +/obj/effect/landmark/entry_point/aft, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "oN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -2672,13 +2855,27 @@ }, /area/database_freighter) "px" = ( -/obj/machinery/light/small/emergency{ - dir = 4 - }, -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, -/turf/simulated/floor/shuttle/black, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/database_freighter_shuttle) +"pF" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/iff_beacon{ + pixel_y = 4 + }, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/airless, /area/shuttle/database_freighter_shuttle) "pH" = ( /turf/simulated/floor{ @@ -2698,8 +2895,16 @@ }, /area/database_freighter/checkpoint) "pT" = ( -/obj/machinery/atmospherics/binary/pump/high_power, -/turf/simulated/floor/shuttle/black, +/obj/machinery/computer/ship/navigation/terminal{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "pW" = ( /obj/structure/cable/green{ @@ -2803,11 +3008,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/obj/machinery/light{ - dir = 4; - status = 2 +/turf/simulated/floor{ + temperature = 278.15 }, -/turf/simulated/floor, /area/database_freighter/hangar) "rM" = ( /obj/machinery/door/airlock/mining{ @@ -2821,17 +3024,16 @@ }, /area/database_freighter/eva) "sn" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 - }, -/turf/simulated/floor/shuttle/black, +/obj/structure/bed/stool/chair/shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "so" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/turf/simulated/floor, +/turf/simulated/floor{ + temperature = 278.15 + }, /area/database_freighter/hangar) "sx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -2850,6 +3052,24 @@ "sT" = ( /turf/simulated/wall/shuttle/raider, /area/database_freighter/bridge) +"td" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/engine) "tm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2922,7 +3142,9 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /obj/structure/bed/stool/chair/padded/black, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3040,7 +3262,9 @@ }, /area/database_freighter) "vG" = ( -/obj/effect/shuttle_landmark/nav_database_freighter/nav4, +/obj/effect/shuttle_landmark/nav_database_freighter/nav4{ + dir = 4 + }, /turf/template_noop, /area/space) "vQ" = ( @@ -3092,6 +3316,14 @@ temperature = 278.15 }, /area/database_freighter/hangar) +"wF" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/database_freighter_shuttle) "wQ" = ( /turf/simulated/wall/shuttle/raider, /area/database_freighter/barracks) @@ -3346,6 +3578,21 @@ }, /turf/simulated/floor/tiled/dark, /area/database_freighter/storage) +"AM" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/engine) "AY" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms"; @@ -3369,18 +3616,11 @@ }, /area/database_freighter/engine) "Bv" = ( -/obj/machinery/shipsensors/weak, -/obj/structure/railing/mapped{ - dir = 4 +/obj/machinery/door/blast/regular, +/turf/simulated/floor{ + temperature = 278.15 }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/floor, -/area/shuttle/database_freighter_shuttle) +/area/database_freighter/hangar) "BA" = ( /obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled/dark{ @@ -3567,6 +3807,15 @@ }, /turf/simulated/wall/shuttle/raider, /area/database_freighter/storage) +"DT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4; + icon_state = "warning" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "DX" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ @@ -3629,6 +3878,20 @@ temperature = 278.15 }, /area/database_freighter/storage) +"Ez" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + icon_state = "warning" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "Fd" = ( /obj/structure/table/standard, /obj/machinery/door/window/brigdoor/westleft{ @@ -3713,20 +3976,10 @@ }, /area/database_freighter/barracks) "Gr" = ( -/obj/machinery/iff_beacon, -/obj/structure/railing/mapped{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor, +/turf/simulated/wall/shuttle/raider, /area/shuttle/database_freighter_shuttle) "GV" = ( /obj/machinery/artifact_analyser, @@ -3755,19 +4008,35 @@ "Hr" = ( /turf/space/transit/north, /area/space) +"HD" = ( +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/shuttle/database_freighter_shuttle) "HK" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - name = "Port docking controller"; - pixel_x = 6; - pixel_y = 28; - tag_door = "database_freighter_shuttle_out"; - id_tag = "database_freighter_shuttle" - }, -/obj/machinery/computer/ship/sensors{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/turf/simulated/floor/shuttle/black, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) +"Ic" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/crate/internals, +/obj/item/storage/bag/inflatable, +/obj/item/device/oxycandle, +/obj/item/tank/emergency_oxygen{ + pixel_x = 5 + }, +/obj/item/tank/emergency_oxygen/engi{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "Id" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3823,11 +4092,31 @@ temperature = 278.15 }, /area/database_freighter/eva) -"Jn" = ( -/obj/machinery/atmospherics/portables_connector{ +"Ja" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/shuttle/black, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/database_freighter_shuttle) +"Jn" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/database_freighter_shuttle) "Ju" = ( /obj/machinery/atmospherics/pipe/tank/carbon_dioxide, @@ -3897,6 +4186,12 @@ temperature = 278.15 }, /area/database_freighter/engineering) +"Kt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/database_freighter_shuttle) "Ku" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped{ @@ -3913,6 +4208,13 @@ temperature = 278.15 }, /area/database_freighter/engine) +"KE" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, +/turf/simulated/floor/plating, +/area/database_freighter/engine) "KQ" = ( /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor{ @@ -3939,16 +4241,13 @@ }, /area/database_freighter) "Lu" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 }, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/database_freighter/engine) +/turf/template_noop, +/area/space) "LA" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /obj/effect/landmark/entry_point/aft{ name = "aft engines, starboard" }, @@ -4047,6 +4346,12 @@ temperature = 278.15 }, /area/database_freighter/hangar) +"Ni" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 5 + }, +/turf/simulated/wall/shuttle/raider, +/area/database_freighter/engine) "Nm" = ( /obj/structure/cable/green{ d1 = 4; @@ -4184,6 +4489,10 @@ temperature = 278.15 }, /area/database_freighter) +"OR" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/template_noop, +/area/space) "Pb" = ( /turf/simulated/floor/reinforced{ temperature = 278.15 @@ -4195,13 +4504,13 @@ /turf/simulated/floor/plating, /area/database_freighter/engine) "PH" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor{ temperature = 278.15 }, /area/database_freighter/laboratory) "PO" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/reinforced{ temperature = 278.15 }, @@ -4218,8 +4527,7 @@ }, /area/database_freighter) "PW" = ( -/obj/effect/shuttle_landmark/database_freighter_shuttle/transit, -/turf/space/transit/north, +/turf/space, /area/space) "Qb" = ( /obj/machinery/iff_beacon, @@ -4250,6 +4558,14 @@ temperature = 278.15 }, /area/database_freighter/hangar) +"Ql" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "Qp" = ( /obj/machinery/telecomms/allinone/ship, /obj/machinery/light/small{ @@ -4257,6 +4573,10 @@ }, /turf/simulated/floor/plating, /area/database_freighter/engineering) +"Qr" = ( +/obj/machinery/atmospherics/unary/engine, +/turf/simulated/floor/plating, +/area/shuttle/database_freighter_shuttle) "QE" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 @@ -4281,7 +4601,7 @@ }, /area/database_freighter) "Rg" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/effect/landmark/entry_point/starboard{ name = "starboard, hull" }, @@ -4289,16 +4609,14 @@ temperature = 278.15 }, /area/database_freighter) -"Rs" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "database_bridge" +"Rj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 }, /turf/simulated/floor{ temperature = 278.15 }, -/area/database_freighter) +/area/database_freighter/engine) "Rt" = ( /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4358,10 +4676,13 @@ }, /area/database_freighter) "SW" = ( -/obj/effect/landmark/entry_point/port{ - name = "port, hangar" +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + icon_state = "warning" + }, +/turf/simulated/floor{ + temperature = 278.15 }, -/turf/unsimulated/wall/fakepdoor, /area/database_freighter/hangar) "Td" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -4403,6 +4724,23 @@ }, /turf/template_noop, /area/space) +"TL" = ( +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/engine) "TN" = ( /obj/structure/table/standard, /obj/effect/floor_decal/industrial/outline/yellow, @@ -4412,6 +4750,16 @@ temperature = 278.15 }, /area/database_freighter/laboratory) +"Uv" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/hangar) "UN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4442,7 +4790,6 @@ /area/database_freighter/captain_quarters) "Vk" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /obj/effect/landmark/entry_point/aft{ name = "aft engines, port" }, @@ -4527,7 +4874,9 @@ }, /area/database_freighter) "Wo" = ( -/obj/effect/shuttle_landmark/nav_database_freighter/nav1, +/obj/effect/shuttle_landmark/nav_database_freighter/nav1{ + dir = 8 + }, /turf/template_noop, /area/space) "Wx" = ( @@ -4571,6 +4920,22 @@ temperature = 278.15 }, /area/database_freighter/engineering) +"Xv" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/database_freighter/engine) "Xx" = ( /obj/structure/cable/green{ d2 = 2; @@ -4607,12 +4972,21 @@ temperature = 278.15 }, /area/database_freighter/captain_quarters) -"YC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/black, +"Ys" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft, /turf/simulated/floor{ temperature = 278.15 }, /area/database_freighter/engine) +"YC" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/black, +/turf/simulated/wall/shuttle/raider, +/area/database_freighter/engine) "YD" = ( /obj/machinery/light{ dir = 1 @@ -4666,7 +5040,7 @@ /turf/simulated/wall/shuttle/raider, /area/database_freighter/captain_quarters) "Zq" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor{ temperature = 278.15 }, @@ -6449,12 +6823,12 @@ Hr Hr Hr Hr -Hr -Hr -Hr -Hr -Hr -Hr +PW +PW +PW +PW +PW +PW Hr Hr Hr @@ -6612,11 +6986,11 @@ Hr Hr Hr Hr -Hr -Hr -Hr -Hr -Hr +PW +PW +PW +PW +PW Hr Hr Hr @@ -6774,11 +7148,11 @@ Hr Hr Hr Hr -Hr -Hr -Hr -Hr -Hr +PW +PW +PW +PW +PW Hr Hr Hr @@ -6936,11 +7310,11 @@ Hr Hr Hr Hr -Hr PW -Hr -Hr -Hr +PW +PW +PW +PW Hr Hr Hr @@ -7094,15 +7468,15 @@ Hr Hr Hr Hr +gx Hr Hr Hr -Hr -Hr -Hr -Hr -Hr -Hr +PW +PW +PW +PW +PW Hr Hr Hr @@ -7260,11 +7634,11 @@ Hr Hr Hr Hr -Hr -Hr -Hr -Hr -Hr +PW +PW +PW +PW +PW Hr Hr Hr @@ -10736,7 +11110,7 @@ iB iB iB gn -jd +Ni KA xw YR @@ -11060,7 +11434,7 @@ iB iB iB gn -uY +eZ pH rj xw @@ -11209,13 +11583,13 @@ iB iB iB iB +Lu iB iB +Lu iB iB -iB -iB -iB +Lu iB iB iB @@ -11541,7 +11915,7 @@ iB iB iB iB -iB +OR iB iB iB @@ -11730,7 +12104,7 @@ ki BF BF ew -Rs +Zq iB iB mb @@ -12027,12 +12401,12 @@ iB iB iB iB +OR +iB +iB iB xw -xw -xw -fm -Ek +Jv NJ zo xw @@ -12190,12 +12564,12 @@ iB iB iB iB +iB +iB xw -pH -pH xw -jV -NJ +dw +Nm zo xw Ze @@ -12352,12 +12726,12 @@ iB iB iB iB -pH -pH -pH -pH -Lu -NJ +iB +xw +xw +xw +Ea +Db yb Oe vl @@ -12513,13 +12887,13 @@ iB iB iB iB -iB +OR +xw +xw +xw xw pH -kR -xw pH -NJ gu xw Xs @@ -12642,6 +13016,7 @@ iB iB iB iB +od iB iB iB @@ -12674,14 +13049,13 @@ iB iB iB iB -iB -iB +lM +xw +KE xw xw -xw -xw -UQ -NJ +Ek +pH rj xw Xs @@ -12831,19 +13205,19 @@ iB iB iB iB -JX iB iB iB iB iB iB -iB -iB -iB -xw -Jv -NJ +nE +Xv +Ys +AM +kR +Rj +pH rj xw KQ @@ -12999,13 +13373,13 @@ iB iB iB iB -iB -iB -iB -iB -xw -dw -Nm +jV +TL +td +fm +ga +pH +pH rj xw KQ @@ -13161,13 +13535,13 @@ iB iB iB iB -iB -iB -iB -iB xw -Ea -Db +xw +xw +xw +xw +pH +pH rj xw aC @@ -13323,10 +13697,10 @@ iB iB iB iB -iB -iB -iB -iB +OR +xw +xw +xw xw xw UQ @@ -13487,8 +13861,8 @@ iB iB iB iB -iB -iB +xw +xw xw AC oN @@ -13650,7 +14024,7 @@ iB iB iB iB -iB +xw xw Ju eq @@ -13809,7 +14183,7 @@ iB iB iB iB -iB +OR iB iB iB @@ -13821,17 +14195,17 @@ xw Nf Nf hx -nq -nq +Ez +SW +rg +rg +rg nq fV -eZ -nq -fV -nq -nq -nq -nq +rg +pF +SW +SW bn YM fd @@ -13982,18 +14356,18 @@ rj xw LD Nf +so +Uv +Qr Gr -rg -rg -rg -rg +eU ce iJ +Ic rg +nq rg -rg -rg -rg +kS aX UN Qi @@ -14123,7 +14497,7 @@ iB iB iB iB -od +iB iB iB iB @@ -14145,17 +14519,17 @@ xw YD Nf so -rg +Uv rg dz ej -hT -hT +gQ +Ja dn jv dZ -mF -kS +rg +rg aX UN kC @@ -14295,7 +14669,7 @@ iB iB iB iB -iB +OR iB iB iB @@ -14310,11 +14684,11 @@ so in at bb -hT +jg ls +wF hT -hT -hT +sn sn mF aj @@ -14469,17 +14843,17 @@ xw YD Nf so -rg -rg +kS +oI HK -jg +rg px aP Jn pT nd -mF -kS +rg +rg aX UN be @@ -14611,13 +14985,13 @@ iB iB iB iB +Lu iB iB +Lu iB iB -iB -iB -iB +Lu iB iB iB @@ -14630,18 +15004,18 @@ rj xw LD Nf -Bv -rg -rg -rg -rg -rg +so +kS +Qr +Kt +HD +oF mR cF rg +nq rg -rg -rg +kS aX UN yv @@ -14786,24 +15160,24 @@ iB iB iB gn -jd +Ni pH rj xw -gT +Nf Nf rH -cM -cM -cM -cM -cM -cM +Ql +DT +rg +rg +rg +rg hO +rg cM -cM -cM -cM +DT +DT et kz cG @@ -14952,23 +15326,23 @@ YC zh uY xw -yo -gQ -gQ -gQ -gQ -gQ -gQ -gQ -SW -gQ -gQ -gQ -gQ -gQ -gQ -yo -yo +gT +Nf +Nf +Nf +Nf +Nf +Nf +Nf +Nf +Nf +Nf +Nf +Nf +Nf +Nf +gT +Nf yo cq tR @@ -15110,27 +15484,27 @@ iB iB iB gn -uY +eZ LV xw xw -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB -iB +yo +Bv +Bv +Bv +Bv +Bv +Bv +Bv +lq +Bv +Bv +Bv +Bv +Bv +Bv +yo +yo Cd Cd aH diff --git a/maps/away/ships/pra/database_freighter/database_landmarks.dm b/maps/away/ships/pra/database_freighter/database_landmarks.dm new file mode 100644 index 00000000000..994f2496150 --- /dev/null +++ b/maps/away/ships/pra/database_freighter/database_landmarks.dm @@ -0,0 +1,34 @@ +// --------------------- base type + +/obj/effect/shuttle_landmark/database_freighter + base_area = /area/space + base_turf = /turf/space + +// --------------------- shuttle + +/obj/effect/shuttle_landmark/database_freighter_shuttle/hangar + name = "Database Freighter Shuttle Hangar" + landmark_tag = "nav_database_freighter_shuttle" + docking_controller = "database_freighter_shuttle_dock" + base_area = /area/database_freighter/hangar + base_turf = /turf/simulated/floor/plating + movable_flags = MOVABLE_FLAG_EFFECTMOVE + +// ---- + +/obj/effect/shuttle_landmark/database_freighter_shuttle/transit + name = "In transit" + landmark_tag = "nav_transit_database_freighter_shuttle" + base_turf = /turf/space/transit/north + +// --------------------- docks + +/obj/effect/shuttle_landmark/database_freighter/dock/aft + name = "Dock, Aft" + landmark_tag = "nav_database_freighter_dock_starboard" + docking_controller = "airlock_database_freighter_dock_starboard" + +/obj/effect/map_effect/marker/airlock/docking/database_freighter/dock/aft + name = "Dock, Aft" + landmark_tag = "nav_database_freighter_dock_starboard" + master_tag = "airlock_database_freighter_starboard" diff --git a/maps/away/ships/sol_merc/fsf_patrol_ship.dm b/maps/away/ships/sol_merc/fsf_patrol_ship.dm index 0ff9424ce43..d953d2e1b24 100644 --- a/maps/away/ships/sol_merc/fsf_patrol_ship.dm +++ b/maps/away/ships/sol_merc/fsf_patrol_ship.dm @@ -2,7 +2,7 @@ name = "FSF Corvette" description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew." suffixes = list("ships/sol_merc/fsf_patrol_ship.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE) spawn_weight = 1 ship_cost = 1 id = "fsf_patrol_ship" diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dm b/maps/away/ships/tajara/circus/adhomian_circus.dm index c1b49c81877..80ac95a7b4e 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dm @@ -2,7 +2,7 @@ name = "Adhomian Traveling Circus" description = "The N'hanzafu class is a bulky Adhomian freighter designed with a large crew and cargo in mind. This one is painted in bright colors." suffixes = list("ships/tajara/circus/adhomian_circus.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) + sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) spawn_weight = 1 ship_cost = 1 id = "adhomian_circus_ship" @@ -106,15 +106,7 @@ logging_home_tag = "nav_hangar_adhomian_circus_shuttle" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/adhomian_circus_shuttle/hangar - name = "Adhomian Circus Shuttle Hangar" - landmark_tag = "nav_hangar_adhomian_circus_shuttle" - docking_controller = "adhomian_circus_shuttle_dock" - base_area = /area/space - base_turf = /turf/space - movable_flags = MOVABLE_FLAG_EFFECTMOVE - -/obj/effect/shuttle_landmark/adhomian_circus_shuttle/transit - name = "In transit" - landmark_tag = "nav_transit_adhomian_circus_shuttle" - base_turf = /turf/space/transit/north +/obj/effect/map_effect/marker/airlock/shuttle/adhomian_circus_shuttle + name = "Adhomian Circus Shuttle" + shuttle_tag = "Adhomian Circus Shuttle" + master_tag = "adhomian_circus_shuttle" diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm index 21c611b95d8..0950b0830c0 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dmm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm @@ -58,15 +58,27 @@ }, /area/adhomian_circus/starboard) "akn" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/effect/map_effect/marker/airlock/shuttle/adhomian_circus_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "alY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -96,7 +108,6 @@ /area/adhomian_circus/bridge) "ara" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /turf/simulated/floor/airless, /area/adhomian_circus/engine) "atO" = ( @@ -263,14 +274,10 @@ }, /area/adhomian_circus/maintenance) "bmD" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, +/turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) "bpn" = ( /obj/item/device/flashlight/lamp/stage, @@ -289,16 +296,16 @@ /turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/maintenance) "bsf" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, -/turf/simulated/floor/plating{ +/turf/simulated/floor/carpet/art{ temperature = 278.15 }, -/area/shuttle/adhomian_circus_shuttle) +/area/adhomian_circus/hangar) "bsl" = ( -/obj/effect/landmark/entry_point/east{ - name = "port, crew compartment" +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 }, /turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) @@ -369,22 +376,14 @@ /turf/simulated/floor/airless, /area/adhomian_circus/bridge) "bNj" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/fuel_port/hydrogen{ - pixel_y = -32 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, +/turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) "bOm" = ( -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/effect/landmark/entry_point/aft, +/turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) "bSj" = ( /obj/structure/railing/mapped, @@ -524,10 +523,12 @@ }, /area/adhomian_circus/fortune) "cBJ" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/power/smes/buildable/third_party_shuttle, +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "cCN" = ( /obj/structure/cable/green{ @@ -640,9 +641,6 @@ temperature = 278.15 }, /area/adhomian_circus/port) -"dhp" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/tamer) "dib" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -716,12 +714,40 @@ /turf/simulated/floor/carpet/darkblue, /area/adhomian_circus/fortune) "dzv" = ( -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ dir = 4 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/adhomian_circus_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/adhomian_circus_shuttle) "dAH" = ( /obj/effect/floor_decal/corner/brown{ @@ -771,13 +797,13 @@ }, /area/adhomian_circus/port) "dOG" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomian_circus/hangar) +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) "dOO" = ( /obj/machinery/computer/ship/engines{ dir = 1 @@ -819,9 +845,6 @@ temperature = 278.15 }, /area/adhomian_circus/fortune) -"dVn" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/fortune) "edV" = ( /obj/structure/table/stone/marble, /turf/simulated/floor/lino/diamond{ @@ -991,11 +1014,9 @@ }, /area/adhomian_circus/starboard) "eQz" = ( -/obj/effect/overmap/visitable/ship/landable/adhomian_circus_shuttle, -/obj/machinery/hologram/holopad/long_range, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/binary/pump/fuel/on, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "eRx" = ( /turf/simulated/floor/holofloor/tiled/ramp{ @@ -1025,15 +1046,19 @@ }, /area/adhomian_circus/port) "fay" = ( -/obj/machinery/power/smes/buildable/third_party_shuttle, /obj/structure/cable/green{ + d1 = 4; d2 = 8; - icon_state = "0-8" + icon_state = "4-8" }, -/turf/simulated/floor/plating{ +/obj/machinery/light{ + dir = 1; + icon_state = "tube_empty" + }, +/turf/simulated/floor/carpet/art{ temperature = 278.15 }, -/area/shuttle/adhomian_circus_shuttle) +/area/adhomian_circus/hangar) "fcj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1084,9 +1109,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 9 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/engine) "fwf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1104,16 +1127,36 @@ }, /area/adhomian_circus/starboard) "fzC" = ( -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE"; + frame_color = "#BDB6AE"; + spawn_firedoor = 1; + spawn_grille = 1 }, -/area/adhomian_circus/hangar) +/obj/effect/landmark/entry_point/fore, +/turf/simulated/floor/plating, +/area/shuttle/adhomian_circus_shuttle) "fDc" = ( /obj/structure/extinguisher_cabinet/east, /turf/simulated/floor/tiled{ temperature = 278.15 }, /area/adhomian_circus/port) +"fDP" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 2; + pixel_y = 28; + pixel_x = -6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/turf/simulated/floor/plating, +/area/adhomian_circus/hangar) "fFD" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -1133,8 +1176,24 @@ }, /area/adhomian_circus/port) "fHU" = ( -/obj/effect/map_effect/airlock/w_to_e/long/square, -/turf/simulated/wall/shuttle/space_ship, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = 28; + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/obj/effect/shuttle_landmark/adhomian_circus/dock/port{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/adhomian_circus/hangar) "fLF" = ( /obj/effect/floor_decal/corner/brown{ @@ -1216,15 +1275,16 @@ }, /area/adhomian_circus/port) "gkO" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped, -/obj/machinery/iff_beacon/name_change, -/obj/structure/railing/mapped{ +/obj/machinery/computer/ship/engines/terminal{ dir = 4 }, -/turf/simulated/floor/airless, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "gly" = ( /obj/effect/floor_decal/corner{ @@ -1390,10 +1450,7 @@ /area/adhomian_circus/port) "hdA" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/black, -/obj/machinery/meter, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/engine) "hke" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -1558,14 +1615,10 @@ }, /area/adhomian_circus/clown) "iGV" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "iJi" = ( /obj/machinery/light/small{ @@ -1656,10 +1709,13 @@ }, /area/adhomian_circus/maintenance) "jcV" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/structure/bed/stool/chair/shuttle{ + dir = 4 }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "jeu" = ( /obj/effect/floor_decal/corner/mauve{ @@ -1678,20 +1734,14 @@ }, /area/adhomian_circus/port) "jjh" = ( -/obj/effect/shuttle_landmark/adhomian_circus/nav1, +/obj/effect/shuttle_landmark/adhomian_circus/nav1{ + dir = 1 + }, /turf/template_noop, /area/space) "jjZ" = ( -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc/west{ - req_access = list(202) - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) "jqO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -1708,21 +1758,30 @@ }, /area/adhomian_circus/starboard) "juq" = ( -/obj/machinery/computer/ship/helm{ - dir = 1 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/shuttle/adhomian_circus_shuttle) -"jwF" = ( -/obj/machinery/light/small{ +/obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 }, -/area/adhomian_circus/hangar) +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) +"jwF" = ( +/obj/structure/lattice/catwalk, +/obj/item/hullbeacon/green{ + pixel_y = 4; + pixel_x = -6 + }, +/obj/item/hullbeacon/red{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, +/turf/simulated/floor/airless, +/area/shuttle/adhomian_circus_shuttle) "jzx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -1786,6 +1845,16 @@ "jQR" = ( /turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/engine/port) +"jRG" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/iff_beacon{ + pixel_y = 4 + }, +/turf/simulated/floor/airless, +/area/shuttle/adhomian_circus_shuttle) "jSm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1799,12 +1868,15 @@ }, /area/adhomian_circus/maintenance) "jSL" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8 +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/power/apc/east{ + req_access = null }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "jZG" = ( /obj/structure/cable/green{ @@ -1826,22 +1898,22 @@ }, /area/adhomian_circus/fortune) "kbv" = ( -/obj/machinery/power/terminal{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/shuttle/adhomian_circus_shuttle) +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/turf/simulated/floor/plating, +/area/adhomian_circus/hangar) "kls" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/obj/effect/landmark/entry_point/south{ - name = "fore, engine" +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/shipsensors/weak{ + pixel_y = 4; + pixel_x = -1 }, /turf/simulated/floor/airless, /area/shuttle/adhomian_circus_shuttle) @@ -1893,7 +1965,6 @@ /area/adhomian_circus/tamer) "kvN" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /obj/effect/landmark/entry_point/aft{ name = "aft engines, starboard" }, @@ -1946,13 +2017,9 @@ }, /area/adhomian_circus/starboard) "kKS" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/turf/simulated/floor/carpet/art{ - temperature = 278.15 - }, -/area/adhomian_circus/hangar) +/obj/structure/bed/stool/chair/shuttle, +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) "kMJ" = ( /obj/machinery/vending/boozeomat{ req_access = null @@ -2009,24 +2076,27 @@ temperature = 278.15 }, /area/adhomian_circus/crew) -"kRJ" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/shuttle/adhomian_circus_shuttle) "kTl" = ( /turf/simulated/floor/marble{ temperature = 278.15 }, /area/adhomian_circus/port) "kUb" = ( -/obj/machinery/atmospherics/portables_connector{ - layer = 2.8; - dir = 4 +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/plating{ +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1337; + id_tag = "adhomian_circus_shuttle_dock"; + tag_door = "circus_hangar_door"; + pixel_x = -28 + }, +/turf/simulated/floor/carpet/art{ temperature = 278.15 }, -/area/shuttle/adhomian_circus_shuttle) +/area/adhomian_circus/hangar) "kUM" = ( /turf/simulated/floor/holofloor/tiled/ramp{ dir = 1; @@ -2060,11 +2130,12 @@ }, /area/adhomian_circus/maintenance) "lia" = ( -/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/machinery/meter, /turf/simulated/floor/plating{ temperature = 278.15 }, -/area/adhomian_circus/hangar) +/area/adhomian_circus/engine) "lln" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2173,7 +2244,9 @@ }, /area/adhomian_circus/clown) "lGK" = ( -/obj/effect/shuttle_landmark/adhomian_circus/nav3, +/obj/effect/shuttle_landmark/adhomian_circus/nav3{ + dir = 8 + }, /turf/template_noop, /area/space) "lHi" = ( @@ -2243,18 +2316,19 @@ }, /area/adhomian_circus/tamer) "lYK" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 }, -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/outline_door/red{ dir = 4 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/shuttle/adhomian_circus_shuttle) +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/turf/simulated/floor/plating, +/area/adhomian_circus/hangar) "lYX" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" }, @@ -2373,15 +2447,16 @@ }, /area/adhomian_circus/starboard) "mvI" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/computer/ship/navigation/terminal{ dir = 8 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/light{ + dir = 4 }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "mIJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2398,6 +2473,18 @@ temperature = 278.15 }, /area/adhomian_circus/maintenance) +"mLH" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/turf/simulated/floor/tiled/dark, +/area/adhomian_circus/hangar) "mNK" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -2473,13 +2560,15 @@ }, /area/adhomian_circus/fortune) "nbY" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/turf/simulated/floor/carpet/art{ - temperature = 278.15 +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 }, -/area/adhomian_circus/hangar) +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) "ndt" = ( /obj/effect/floor_decal/corner_wide/grey{ dir = 6 @@ -2524,15 +2613,19 @@ temperature = 278.15 }, /area/adhomian_circus/hangar) +"njB" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) "npy" = ( /obj/effect/landmark/entry_point/starboard{ name = "starboard, stage" }, /turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/tamer) -"nqs" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/clown) "ntq" = ( /obj/effect/floor_decal/corner/mauve{ dir = 9 @@ -2611,6 +2704,22 @@ temperature = 278.15 }, /area/adhomian_circus/port) +"nBx" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/adhomian_circus_shuttle, +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) "nCk" = ( /obj/structure/cable/green{ d1 = 4; @@ -2639,27 +2748,36 @@ }, /area/adhomian_circus/maintenance) "nDF" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28; + pixel_x = 6 }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/turf/simulated/floor/plating, /area/adhomian_circus/hangar) "nNZ" = ( /obj/machinery/door/airlock/external{ - frequency = 1337; - icon_state = "door_locked"; - id_tag = "adhomian_circus_shuttle_out"; dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = -28; + dir = 4 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/shuttle/adhomian_circus_shuttle) +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/turf/simulated/floor/tiled/dark, +/area/adhomian_circus/hangar) "nTh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2676,7 +2794,9 @@ }, /area/adhomian_circus/crew) "nTy" = ( -/obj/effect/shuttle_landmark/adhomian_circus/nav2, +/obj/effect/shuttle_landmark/adhomian_circus/nav2{ + dir = 4 + }, /turf/template_noop, /area/space) "nUu" = ( @@ -2685,8 +2805,22 @@ }, /area/adhomian_circus/clown) "nVg" = ( -/obj/effect/map_effect/airlock/s_to_n/long, -/turf/simulated/wall/shuttle/space_ship, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port, +/turf/simulated/floor/tiled/dark, /area/adhomian_circus/hangar) "nWC" = ( /obj/effect/floor_decal/corner_wide/grey/full{ @@ -2724,10 +2858,6 @@ temperature = 278.15 }, /area/adhomian_circus/maintenance) -"oaV" = ( -/obj/effect/shuttle_landmark/adhomian_circus_shuttle/hangar, -/turf/template_noop, -/area/space) "ocw" = ( /obj/item/dumbbell/barbell/hundredeighty, /obj/effect/floor_decal/industrial/outline/yellow, @@ -2748,13 +2878,20 @@ /turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/port) "onz" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, -/obj/effect/landmark/entry_point/north{ - name = "aft, bridge" +/obj/machinery/power/terminal{ + dir = 4 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "oov" = ( /obj/effect/floor_decal/corner_wide/grey{ @@ -2806,18 +2943,22 @@ /turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) "oGi" = ( -/obj/machinery/computer/shuttle_control/explore/adhomian_circus_shuttle{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1337; - id_tag = "adhomian_circus_shuttle"; - tag_door = "adhomian_circus_shuttle_out"; - pixel_x = -24 +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "oHV" = ( /turf/space, @@ -2826,13 +2967,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 9 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/adhomian_circus/engine/port) -"oMS" = ( /turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/crew) +/area/adhomian_circus/engine/port) "oTz" = ( /obj/item/reagent_containers/food/snacks/egg/schlorrgo, /obj/item/reagent_containers/food/snacks/egg/schlorrgo, @@ -2904,12 +3040,12 @@ }, /area/adhomian_circus/fortune) "pgu" = ( -/obj/machinery/computer/ship/engines{ - dir = 8 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/hologram/holopad/long_range, +/obj/effect/overmap/visitable/ship/landable/adhomian_circus_shuttle, +/obj/structure/cable/green{ + icon_state = "1-4" }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/adhomian_circus_shuttle) "piq" = ( /turf/simulated/floor/tiled{ @@ -2943,19 +3079,14 @@ temperature = 278.15 }, /area/adhomian_circus/engine/port) -"ppy" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/port) "prU" = ( -/obj/machinery/atmospherics/binary/pump/high_power{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#BDB6AE"; + frame_color = "#BDB6AE"; + spawn_firedoor = 1; + spawn_grille = 1 }, +/turf/simulated/floor/plating, /area/shuttle/adhomian_circus_shuttle) "psN" = ( /obj/structure/cable/green{ @@ -2967,18 +3098,27 @@ temperature = 278.15 }, /area/adhomian_circus/hangar) -"pxV" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/bridge) "pLA" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 +/obj/machinery/door/airlock/external{ + frequency = 1337; + icon_state = "door_locked"; + id_tag = "circus_hangar_door"; + locked = 1; + req_access = list(202); + dir = 1 + }, +/obj/effect/shuttle_landmark/adhomian_circus_shuttle/hangar{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/plating{ temperature = 278.15 }, -/area/shuttle/adhomian_circus_shuttle) +/area/adhomian_circus/hangar) "pOw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3104,11 +3244,14 @@ }, /area/adhomian_circus/engine) "qtp" = ( -/obj/structure/table/standard, -/obj/item/storage/bag/inflatable, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 }, +/obj/machinery/alarm/east{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "qvv" = ( /obj/effect/floor_decal/corner/lime, @@ -3159,23 +3302,9 @@ }, /area/adhomian_circus/bridge) "qLr" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/external{ - frequency = 1337; - icon_state = "door_locked"; - id_tag = "circus_hangar_door"; - locked = 1; - req_access = list(202); - dir = 4 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/adhomian_circus/hangar) +/obj/effect/landmark/entry_point/port, +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/adhomian_circus_shuttle) "qOv" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -3227,11 +3356,10 @@ }, /area/adhomian_circus/engine) "raB" = ( -/obj/structure/table/standard, -/obj/item/device/flashlight/lamp, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/structure/cable/green{ + icon_state = "1-2" }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/adhomian_circus_shuttle) "rnu" = ( /obj/machinery/light{ @@ -3419,10 +3547,13 @@ }, /area/adhomian_circus/hangar) "skB" = ( -/obj/structure/bed/stool/chair/shuttle, -/turf/simulated/floor/plating{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "sth" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3456,17 +3587,8 @@ }, /area/adhomian_circus/port) "sBE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/unary/engine, +/turf/simulated/floor/plating, /area/shuttle/adhomian_circus_shuttle) "sMK" = ( /obj/item/reagent_containers/food/snacks/pie, @@ -3562,9 +3684,14 @@ }, /area/adhomian_circus/hangar) "sTW" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/portables_connector/fuel, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/fuel_port/hydrogen{ + pixel_y = 28; + pixel_x = 6 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "sVk" = ( /turf/simulated/floor/tiled{ @@ -3600,18 +3727,8 @@ }, /area/adhomian_circus/starboard) "tmJ" = ( -/obj/machinery/door/airlock/external{ - frequency = 1337; - icon_state = "door_locked"; - id_tag = "adhomian_circus_shuttle_out"; - dir = 4 - }, -/obj/effect/landmark/entry_point/west{ - name = "starboard, crew compartment" - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/obj/effect/landmark/entry_point/starboard, +/turf/simulated/wall/shuttle/space_ship, /area/shuttle/adhomian_circus_shuttle) "tqA" = ( /obj/machinery/door/airlock/hatch{ @@ -3638,50 +3755,16 @@ }, /area/adhomian_circus/port) "tvi" = ( -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, -/obj/machinery/atmospherics/portables_connector{ - layer = 2.8; - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/air/airlock{ - start_pressure = 1000.97 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window{ - req_access = list(202) - }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomian_circus/hangar) +/turf/simulated/wall/shuttle/space_ship, +/area/shuttle/adhomian_circus_shuttle) "txZ" = ( /turf/simulated/floor/plating{ temperature = 278.15 }, /area/adhomian_circus/engine/port) -"tAG" = ( -/obj/machinery/alarm/cold/north{ - req_one_access = null; - req_access = list(202) - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/shuttle/adhomian_circus_shuttle) "tHa" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -3713,24 +3796,15 @@ /area/adhomian_circus/hangar) "tJW" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/black, +/turf/simulated/wall/shuttle/space_ship, +/area/adhomian_circus/engine/port) +"tPC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/machinery/meter, /turf/simulated/floor/plating{ temperature = 278.15 }, /area/adhomian_circus/engine/port) -"tPC" = ( -/obj/machinery/door/airlock/external{ - frequency = 1337; - icon_state = "door_locked"; - id_tag = "circus_hangar_door"; - locked = 1; - req_access = list(202); - dir = 4 - }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, -/area/adhomian_circus/hangar) "tPX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black{ dir = 8 @@ -3748,16 +3822,23 @@ temperature = 278.15 }, /area/adhomian_circus/starboard) -"tZg" = ( -/obj/machinery/shipsensors/weak, -/obj/structure/railing/mapped{ +"tWR" = ( +/obj/effect/floor_decal/spline/plain/grey{ dir = 4 }, -/obj/structure/railing/mapped, -/obj/structure/railing/mapped{ +/obj/machinery/computer/shuttle_control/explore/adhomian_circus_shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) +"tZg" = ( +/obj/machinery/computer/ship/sensors/terminal{ dir = 8 }, -/turf/simulated/floor/airless, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/adhomian_circus_shuttle) "ujs" = ( /obj/machinery/light/small{ @@ -3816,7 +3897,6 @@ /area/adhomian_circus/port) "uMY" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /obj/effect/landmark/entry_point/aft{ name = "aft engines, port" }, @@ -3864,9 +3944,6 @@ temperature = 278.15 }, /area/adhomian_circus/port) -"vcr" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/starboard) "vfB" = ( /obj/structure/table/wood, /obj/item/reagent_containers/spray, @@ -3945,16 +4022,11 @@ }, /area/adhomian_circus/port) "vuS" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1337; - id_tag = "adhomian_circus_shuttle_dock"; - tag_door = "circus_hangar_door"; - pixel_x = -28 +/obj/machinery/computer/ship/helm/terminal{ + dir = 1 }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomian_circus/hangar) +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) "vyl" = ( /obj/machinery/alarm/cold/north{ req_one_access = null; @@ -4014,9 +4086,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/engine) "vFj" = ( /obj/item/trap/animal/medium, @@ -4191,7 +4261,6 @@ /area/adhomian_circus/port) "wEA" = ( /obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, /turf/simulated/floor/airless, /area/adhomian_circus/engine/port) "wFh" = ( @@ -4219,9 +4288,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 }, -/turf/simulated/floor/plating{ - temperature = 278.15 - }, +/turf/simulated/wall/shuttle/space_ship, /area/adhomian_circus/engine/port) "wLA" = ( /obj/machinery/atmospherics/portables_connector{ @@ -4301,7 +4368,7 @@ }, /area/adhomian_circus/port) "xju" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, @@ -4380,9 +4447,6 @@ temperature = 278.15 }, /area/adhomian_circus/bridge) -"xOg" = ( -/turf/simulated/wall/shuttle/space_ship, -/area/adhomian_circus/engine) "xRX" = ( /turf/template_noop, /area/space) @@ -4395,6 +4459,24 @@ temperature = 278.15 }, /area/adhomian_circus/port) +"xUF" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/crate/internals, +/obj/item/storage/bag/inflatable, +/obj/item/device/oxycandle, +/obj/item/tank/emergency_oxygen{ + pixel_x = 5 + }, +/obj/item/tank/emergency_oxygen/engi{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/tiled/dark, +/area/shuttle/adhomian_circus_shuttle) "xWm" = ( /obj/structure/table/wood, /obj/item/razor, @@ -40544,7 +40626,7 @@ xHA xHA xHA xuV -vcr +xuV xRX xRX xRX @@ -40800,9 +40882,9 @@ lUV vFj pda mfs -vcr xuV -vcr +xuV +xuV xRX xRX xRX @@ -41042,14 +41124,14 @@ xRX xRX kvN hdA -hke +lia hke hke vBV hke bXS sVW -dhp +xHA nfV pbe pbe @@ -41057,10 +41139,10 @@ hoX rxp rxp eit -vcr +xuV yjk -vcr -vcr +xuV +xuV xRX xRX xRX @@ -41306,7 +41388,7 @@ lgm cCN rBD kCJ -dhp +xHA nxu pdu mcf @@ -41314,11 +41396,11 @@ kOW cUS oTz kvG -vcr +xuV yjk yjk -vcr -vcr +xuV +xuV xRX xRX xRX @@ -41554,7 +41636,7 @@ xRX xRX xRX xRX -xOg +ehz ehz ehz ehz @@ -41563,19 +41645,19 @@ ehz ehz qWL ehz -dhp -dhp -dhp -dhp +xHA +xHA +xHA +xHA qhw -dhp -dhp -dhp -vcr +xHA +xHA +xHA +xuV yjk yjk yjk -vcr +xuV xRX xRX xRX @@ -41811,7 +41893,7 @@ xRX xRX xRX xRX -vcr +xuV aSm aSm thx @@ -41829,10 +41911,10 @@ aSm aSm aSm xuV -vcr -vcr -vcr -vcr +xuV +xuV +xuV +xuV xRX xRX xRX @@ -42063,8 +42145,8 @@ xRX xRX xRX xRX -nqs -nqs +ngK +ngK ngK ngK ngK @@ -42089,7 +42171,7 @@ gUk xtx vmI dtM -vcr +xuV xRX xRX xRX @@ -42319,8 +42401,8 @@ xRX xRX xRX ngK -nqs -nqs +ngK +ngK vfB qam gbO @@ -42346,7 +42428,7 @@ rLF hwR hwR gYs -vcr +xuV xRX xRX xRX @@ -42603,7 +42685,7 @@ rLF hwR hwR rqo -vcr +xuV xRX xRX xRX @@ -42860,7 +42942,7 @@ rLF hwR hwR gYs -vcr +xuV xRX xRX xRX @@ -43079,12 +43161,12 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX -xRX -xRX +oFG +oFG +oFG +prU +tmJ +oFG xRX xRX xRX @@ -43335,15 +43417,15 @@ xRX xRX xRX xRX -xRX -oaV -xRX -xRX -xRX -xRX -xRX -xRX -xRX +sBE +tvi +sTW +eQz +njB +xUF +oFG +prU +oFG xRX xRX dPw @@ -43374,7 +43456,7 @@ rLF hwR hwR gYs -vcr +xuV xRX xRX xRX @@ -43587,21 +43669,21 @@ xRX xRX xRX xRX -kRJ -kRJ -kRJ -kRJ -kRJ -kRJ +xRX +xRX +gdx +gdx +gdx +oFG bsl -kRJ -kRJ -kRJ -kRJ +jjZ +dOG +nbY +jcV gkO -xRX -xRX -xRX +tWR +oFG +oFG xRX ngK xWm @@ -43631,7 +43713,7 @@ rLF hwR hwR gYs -vcr +xuV xRX xRX xRX @@ -43844,23 +43926,23 @@ xRX xRX xRX xRX -sTW -lYK -jjZ +xRX +xRX +gdx kUb pLA akn dzv -dzv +nBx oGi raB -cBJ +pgu +kKS +kKS +vuS +fzC xRX -xRX -xRX -xRX -xRX -nqs +ngK vzp aab iew @@ -43888,7 +43970,7 @@ rLF hwR hwR gYs -vcr +xuV xRX xRX xRX @@ -44101,23 +44183,23 @@ xRX xRX xRX xRX -kls -jcV -prU -sBE +xRX +xRX +gdx +jLO +gdx bOm -bOm -bOm -eQz +bNj +oFG skB juq onz +mvI +tZg +oFG +oFG xRX -xRX -xRX -xRX -xRX -nqs +ngK wwC nUu nUu @@ -44145,7 +44227,7 @@ rLF hwR hwR gYs -vcr +xuV xRX xRX xRX @@ -44358,23 +44440,23 @@ xRX xRX xRX xRX -sTW -mvI -pgu +xRX +xRX +gdx fay -kbv -bmD +gdx +sBE bmD iGV qtp jSL cBJ +oFG +prU +oFG xRX xRX -xRX -xRX -xRX -nqs +ngK lAY nUu xGS @@ -44402,7 +44484,7 @@ rLF hwR hwR rqo -vcr +xuV xRX xRX xRX @@ -44615,29 +44697,29 @@ xRX xRX xRX xRX -kRJ -kRJ -kRJ +xRX +xRX +gdx +jLO +gdx +xRX oFG -tAG -bsf -bOm -bNj oFG -kRJ -kRJ -tZg +oFG +oFG +qLr +oFG +kls +jRG +jwF xRX -xRX -xRX -xRX -nqs -nqs -nqs -nqs -nqs -nqs -nqs +ngK +ngK +ngK +ngK +ngK +ngK +ngK ngK jqO alY @@ -44659,7 +44741,7 @@ nWC xmQ ndt kFO -vcr +xuV xRX xRX xRX @@ -44874,13 +44956,9 @@ xRX xRX xRX xRX -xRX -kRJ -kRJ -kRJ -tmJ -nNZ -kRJ +gdx +jLO +gdx xRX xRX xRX @@ -44895,7 +44973,11 @@ xRX xRX xRX xRX -vcr +xRX +xRX +xRX +xRX +xuV aSm aSm aSm @@ -44913,12 +44995,12 @@ aSm aSm aSm gab -oMS -oMS -oMS -oMS -oMS -oMS +gab +gab +gab +gab +gab +gab gab xJd xRX @@ -45129,14 +45211,10 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX gdx gdx -tPC -qLr +gdx +jLO gdx gdx gdx @@ -45152,16 +45230,20 @@ gdx gdx gdx gdx -vcr -vcr -vcr -vcr -vcr -vcr -vcr -vcr +gdx +gdx +gdx +gdx +xuV +xuV +xuV +xuV +xuV +xuV +xuV +xuV eIZ -vcr +xuV bql bql bql @@ -45172,16 +45254,16 @@ bql bql cTz lZh -oMS +gab gTj bGH dGc -pxV +mrm mrm xju xju xju -pxV +mrm xRX xRX xRX @@ -45386,21 +45468,21 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX gdx -tvi +eih sQN jLO -vuS +njy cUR njy njy njy +njy +njy cUR irI +irI +irI njy njy cUR @@ -45433,7 +45515,7 @@ eFz sRj luC luC -pxV +mrm kQA dJv gCs @@ -45643,12 +45725,8 @@ xRX xRX xRX xRX -xRX gdx -nDF -nDF -nVg -dOG +njy sQN jLO njy @@ -45657,6 +45735,10 @@ njy njy njy njy +njy +njy +vLy +vLy vLy njy njy @@ -45684,13 +45766,13 @@ sth piT hXM bql -oMS -oMS -oMS +gab +gab +gab kvj luC fpz -pxV +mrm rnu anm pOw @@ -45900,12 +45982,8 @@ xRX xRX xRX xRX -xRX -fzC -fzC -jwF -fzC -kKS +gdx +njy sQN sSK psN @@ -45914,6 +45992,10 @@ psN psN psN psN +psN +psN +seg +seg seg fdH fdH @@ -46157,10 +46239,6 @@ xRX xRX xRX xRX -xRX -gdx -nDF -nDF gdx njy sQN @@ -46171,6 +46249,10 @@ njy njy njy njy +njy +njy +byG +byG byG njy njy @@ -46204,7 +46286,7 @@ ltF luC ykc hIR -pxV +mrm qek xMn piq @@ -46414,21 +46496,21 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX gdx eih sQN -nbY +bsf wLD aaA njy njy njy +njy +njy aaA vHi +vHi +vHi njy njy aaA @@ -46461,7 +46543,7 @@ mSe luC luC luC -pxV +mrm qDO vnh iQA @@ -46671,15 +46753,15 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX gdx gdx -fzC -fzC -fHU +mLH +nVg +gdx +gdx +gdx +gdx +gdx gdx gdx gdx @@ -46695,15 +46777,15 @@ gdx gdx gdx hNT -ppy -ppy -ppy -ppy -ppy -ppy -ppy +hNT +hNT +hNT +hNT +hNT +hNT +hNT wFh -ppy +hNT bql bql bql @@ -46718,12 +46800,12 @@ cFk bGH dIJ bGH -pxV +mrm mrm xju xju xju -pxV +mrm xRX xRX xRX @@ -46929,14 +47011,10 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX -nDF -fzC -lia +gdx nDF +kbv +gdx xRX xRX xRX @@ -46949,7 +47027,11 @@ xRX xRX xRX xRX -ppy +xRX +xRX +xRX +xRX +hNT xix uub sVk @@ -46969,12 +47051,12 @@ sVk sVk sVk gab -oMS -oMS -oMS -oMS -oMS -oMS +gab +gab +gab +gab +gab +gab gab bKA xRX @@ -47186,14 +47268,10 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX -nDF -fzC -fzC -nDF +gdx +fDP +lYK +gdx xRX xRX xRX @@ -47201,14 +47279,18 @@ xRX xRX xRX xRX -dVn -dVn -dVn -dVn -dVn -dVn -dVn -dVn +xRX +xRX +xRX +xRX +cQG +cQG +cQG +cQG +cQG +cQG +cQG +cQG qcw fGZ fGZ @@ -47229,7 +47311,7 @@ wgh rRx aeb wpH -ppy +hNT xRX xRX xRX @@ -47443,13 +47525,9 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX gdx -fzC -fzC +fHU +nNZ gdx xRX xRX @@ -47458,14 +47536,18 @@ xRX xRX xRX xRX -dVn +xRX +xRX +xRX +xRX +cQG aEq pdV eyW iJi sNm nxp -dVn +cQG bAh got got @@ -47486,7 +47568,7 @@ aaG mmv kTl oov -ppy +hNT xRX xRX xRX @@ -47715,14 +47797,14 @@ xRX xRX xRX xRX -dVn +cQG oAa wlK wlK wlK oAa jMa -dVn +cQG fcj got qDL @@ -47743,7 +47825,7 @@ aaG wnH kTl oov -ppy +hNT xRX xRX xRX @@ -47979,7 +48061,7 @@ dyw fpK oAa abp -dVn +cQG fcj got lrP @@ -48000,7 +48082,7 @@ aaG vHM eVA qjZ -ppy +hNT xRX xRX xRX @@ -48229,14 +48311,14 @@ xRX xRX xRX xRX -dVn +cQG oAa wlK wlK wlK oAa xCk -dVn +cQG fcj got lrP @@ -48257,7 +48339,7 @@ aaG bpK hbo oov -ppy +hNT xRX xRX xRX @@ -48486,7 +48568,7 @@ xRX xRX xRX xRX -dVn +cQG ltJ oAa oAa @@ -48514,7 +48596,7 @@ aaG sRM xUu oov -ppy +hNT xRX xRX xRX @@ -48750,7 +48832,7 @@ dVf gAT oAa cJz -dVn +cQG bTK got lrP @@ -49002,12 +49084,12 @@ xRX xRX cQG cQG -dVn -dVn -dVn +cQG +cQG +cQG isG -dVn -dVn +cQG +cQG lHi got lrP @@ -49028,7 +49110,7 @@ aaG gki dMP oov -ppy +hNT xRX xRX xRX @@ -49264,7 +49346,7 @@ ntw iJi oAa mYq -dVn +cQG lHi got qSz @@ -49285,7 +49367,7 @@ aaG gZU kTl oov -ppy +hNT xRX xRX xRX @@ -49521,7 +49603,7 @@ cQG cQG wqJ lmZ -dVn +cQG eqz got got @@ -49542,7 +49624,7 @@ aaG wNw kTl qjZ -ppy +hNT xRX xRX xRX @@ -49760,7 +49842,7 @@ xRX xRX xRX xRX -lGK +xRX xRX xRX xRX @@ -49775,10 +49857,10 @@ xRX xRX xRX cQG -dVn -dVn -dVn -dVn +cQG +cQG +cQG +cQG sSb aTD aTD @@ -49799,7 +49881,7 @@ euC tHx tHx uWs -ppy +hNT xRX xRX xRX @@ -50035,7 +50117,7 @@ xRX xRX xRX xRX -ppy +hNT sVk fDc sVk @@ -50053,10 +50135,10 @@ lbP lbP sVk hNT -ppy -ppy -ppy -ppy +hNT +hNT +hNT +hNT xRX xRX xRX @@ -50302,18 +50384,18 @@ jQR aGz jQR jQR -ppy +hNT fPY kwR edV ixs mgW -ppy -ppy +hNT +hNT ifb ifb ifb -ppy +hNT xRX xRX xRX @@ -50566,11 +50648,11 @@ wpr hvE wpr kMJ -ppy +hNT ifb ifb -ppy -ppy +hNT +hNT xRX xRX xRX @@ -50808,7 +50890,7 @@ xRX xRX uMY tJW -vNj +tPC vNj vNj gVY @@ -50823,11 +50905,11 @@ wpr wpr wpr dsF -ppy +hNT ifb -ppy -ppy -ppy +hNT +hNT +hNT xRX xRX xRX @@ -51080,9 +51162,9 @@ ozN mTv rWg gQT -ppy -ppy -ppy +hNT +hNT +hNT xRX xRX xRX @@ -51338,7 +51420,7 @@ hNT hNT hNT hNT -ppy +hNT xRX xRX xRX @@ -53108,7 +53190,7 @@ xRX xRX xRX xRX -xRX +lGK xRX xRX xRX diff --git a/maps/away/ships/tajara/circus/adhomian_circus_landmarks.dm b/maps/away/ships/tajara/circus/adhomian_circus_landmarks.dm new file mode 100644 index 00000000000..9083e384143 --- /dev/null +++ b/maps/away/ships/tajara/circus/adhomian_circus_landmarks.dm @@ -0,0 +1,34 @@ +// --------------------- base type + +/obj/effect/shuttle_landmark/adhomian_circus + base_area = /area/space + base_turf = /turf/space + +// --------------------- shuttle + +/obj/effect/shuttle_landmark/adhomian_circus_shuttle/hangar + name = "Adhomian Circus Shuttle Hangar" + landmark_tag = "nav_hangar_adhomian_circus_shuttle" + docking_controller = "adhomian_circus_shuttle_dock" + base_area = /area/space + base_turf = /turf/space + movable_flags = MOVABLE_FLAG_EFFECTMOVE + +// ---- + +/obj/effect/shuttle_landmark/adhomian_circus_shuttle/transit + name = "In transit" + landmark_tag = "nav_transit_adhomian_circus_shuttle" + base_turf = /turf/space/transit/north + +// --------------------- docks + +/obj/effect/shuttle_landmark/adhomian_circus/dock/port + name = "Dock, Port" + landmark_tag = "nav_adhomian_circus_dock_port" + docking_controller = "airlock_adhomian_circus_dock_port" + +/obj/effect/map_effect/marker/airlock/docking/adhomian_circus/dock/port + name = "Dock, Port" + landmark_tag = "nav_adhomian_circus_dock_port" + master_tag = "airlock_adhomian_circus_port" diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm index 2fb47fc0fb7..b8d2e7e3eb2 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm @@ -101,18 +101,10 @@ logging_home_tag = "nav_tajaran_smuggler_shuttle" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/hangar - name = "Adhomian Freight Shuttle Hangar" - landmark_tag = "nav_tajaran_smuggler_shuttle" - docking_controller = "tajaran_smuggler_shuttle_dock" - base_area = /area/tajaran_smuggler/hangar - base_turf = /turf/simulated/floor/plating - movable_flags = MOVABLE_FLAG_EFFECTMOVE - -/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/transit - name = "In transit" - landmark_tag = "nav_transit_tajaran_smuggler_shuttle" - base_turf = /turf/space/transit/north +/obj/effect/map_effect/marker/airlock/shuttle/tajaran_smuggler_shuttle + name = "Tajaran Smuggler Shuttle" + shuttle_tag = "Tajaran Smuggler Shuttle" + master_tag = "tajaran_smuggler_shuttle" //cargo hold - the smuggler can just send its cargo hold into space @@ -134,41 +126,3 @@ /obj/machinery/computer/shuttle_control/explore/tajaran_smuggler_cargo name = "cargo ejection control console" shuttle_tag = "Adhomian Freight Cargo" - - -/datum/shuttle/autodock/overmap/tajaran_smuggler_cargo - name = "Adhomian Freight Cargo" - move_time = 20 - shuttle_area = list(/area/shuttle/tajaran_smuggler_cargo) - dock_target = "tajaran_smuggler_cargo" - current_location = "nav_tajaran_smuggler_cargo" - landmark_transition = "nav_transit_tajaran_smuggler_cargo" - range = 1 - fuel_consumption = 2 - logging_home_tag = "nav_tajaran_smuggler_cargo" - defer_initialisation = TRUE - -/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/hangar - name = "Adhomian Freight Cargo Hangar" - landmark_tag = "nav_tajaran_smuggler_cargo" - docking_controller = "tajaran_smuggler_cargo_dock" - base_area = /area/space - base_turf = /turf/space/dynamic - movable_flags = MOVABLE_FLAG_EFFECTMOVE - -/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/transit - name = "In transit" - landmark_tag = "nav_transit_tajaran_smuggler_cargo" - base_turf = /turf/space/transit/north - -/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav1 - name = "Cargo Hold - Port Side" - landmark_tag = "nav_tajaran_smuggler_cargo_1" - base_turf = /turf/space/dynamic - base_area = /area/space - -/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav2 - name = "Cargo Hold - Starboard Side" - landmark_tag = "nav_tajaran_smuggler_cargo_2" - base_turf = /turf/space/dynamic - base_area = /area/space diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm index 9223a7e1422..d7da37488e3 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm @@ -1,10 +1,13 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aaa" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 8; + icon_state = "warning" }, -/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/hangar{ - dir = 8 +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor{ temperature = 278.15 @@ -72,9 +75,9 @@ }, /area/shuttle/tajaran_smuggler_cargo) "afL" = ( -/obj/effect/shuttle_landmark/tajaran_smuggler/nav2, -/turf/template_noop, -/area/space) +/obj/machinery/atmospherics/unary/engine, +/turf/simulated/floor/plating, +/area/shuttle/tajaran_smuggler) "agg" = ( /obj/machinery/light/small{ dir = 8 @@ -113,10 +116,14 @@ }, /area/tajaran_smuggler) "aou" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/machinery/hologram/holopad/long_range, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/turf/unsimulated/floor/plating, +/obj/effect/overmap/visitable/ship/landable/tajaran_smuggler_shuttle, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/tajaran_smuggler) "atB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -133,7 +140,7 @@ }, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -168,10 +175,16 @@ }, /area/tajaran_smuggler) "aBb" = ( -/obj/machinery/recharger/wallcharger{ - pixel_y = 24 +/obj/machinery/computer/ship/navigation/terminal{ + dir = 8 }, -/turf/simulated/wall/shuttle/raider, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "aBQ" = ( /turf/unsimulated/wall/fakepdoor, @@ -200,7 +213,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /turf/simulated/floor{ temperature = 278.15 @@ -221,6 +234,16 @@ temperature = 278.15 }, /area/shuttle/tajaran_smuggler_cargo) +"aJE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/machinery/alarm/east{ + req_one_access = null + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "aLo" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/sink{ @@ -359,11 +382,9 @@ }, /area/shuttle/tajaran_smuggler_cargo) "bfG" = ( -/obj/effect/landmark/entry_point/port{ - name = "port, hangar" - }, -/turf/unsimulated/wall/fakepdoor, -/area/tajaran_smuggler/hangar) +/obj/effect/landmark/entry_point/port, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/tajaran_smuggler) "biG" = ( /turf/simulated/wall/shuttle/raider, /area/tajaran_smuggler/captain_quarters) @@ -395,7 +416,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /obj/machinery/light/small, /turf/simulated/floor{ @@ -403,22 +424,16 @@ }, /area/tajaran_smuggler) "bxR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cult/tome{ - desc = "A black stone altar dedicated to Minharrzka, the goddess of the waters and patroness of sailors."; - icon_state = "churchaltar"; - name = "altar" - }, -/turf/simulated/floor{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/unary/engine, +/turf/simulated/floor/airless, /area/tajaran_smuggler/engine) "bzW" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 8; + icon_state = "warning" + }, +/obj/structure/cable/green{ + icon_state = "1-2" }, /turf/simulated/floor{ temperature = 278.15 @@ -434,10 +449,14 @@ }, /area/tajaran_smuggler/power) "bFk" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/turf/simulated/floor/airless, -/area/tajaran_smuggler/engine) +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/machinery/computer/shuttle_control/explore/tajaran_smuggler_shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "bGz" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -445,7 +464,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /obj/structure/plasticflaps/mining, /obj/machinery/door/blast/shutters{ @@ -510,12 +529,14 @@ }, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /turf/simulated/floor/airless, /area/shuttle/tajaran_smuggler_cargo) "cdq" = ( -/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav2, +/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav2{ + dir = 4 + }, /turf/template_noop, /area/shuttle/tajaran_smuggler_cargo) "cds" = ( @@ -528,15 +549,10 @@ }, /area/tajaran_smuggler/power) "cdD" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/obj/machinery/meter, -/obj/structure/closet/crate/freezer/rations, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/machinery/computer/ship/helm/terminal{ + dir = 1 }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "cfo" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -605,7 +621,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /obj/structure/plasticflaps/mining, /obj/machinery/door/blast/shutters{ @@ -682,6 +698,16 @@ temperature = 278.15 }, /area/tajaran_smuggler/engine) +"dFZ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/hangar) "dHf" = ( /obj/structure/railing/mapped{ dir = 1 @@ -695,20 +721,15 @@ }, /area/shuttle/tajaran_smuggler_cargo) "dHE" = ( -/obj/machinery/iff_beacon, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/obj/structure/railing/mapped{ - dir = 4 +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor{ temperature = 278.15 }, -/area/shuttle/tajaran_smuggler) +/area/tajaran_smuggler/hangar) "dNu" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ @@ -772,6 +793,18 @@ temperature = 278.15 }, /area/tajaran_smuggler) +"eaN" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/machinery/light/small/emergency, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/plating, +/area/adhomian_circus/hangar) "ebG" = ( /obj/effect/landmark/entry_point/starboard{ name = "starboard, maintenance" @@ -779,11 +812,10 @@ /turf/simulated/wall/shuttle/raider, /area/tajaran_smuggler/engine) "eeP" = ( -/obj/effect/map_effect/window_spawner/reinforced, -/obj/effect/landmark/entry_point/south{ - name = "fore, bridge" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/wall/shuttle/raider, /area/shuttle/tajaran_smuggler) "eiX" = ( /obj/structure/bed/stool/bar/padded/red, @@ -886,7 +918,7 @@ /area/tajaran_smuggler) "ePD" = ( /obj/machinery/atmospherics/binary/pump/high_power{ - dir = 8; + dir = 8 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ @@ -912,13 +944,34 @@ temperature = 278.15 }, /area/tajaran_smuggler/power) -"eTq" = ( -/obj/structure/bed/stool/chair/shuttle{ +"eRD" = ( +/obj/machinery/computer/ship/sensors/terminal{ dir = 8 }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) +"eTq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_segment/red{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "eTH" = ( /obj/structure/closet/crate/freezer, @@ -963,7 +1016,7 @@ /area/tajaran_smuggler/atmos) "fjf" = ( /obj/machinery/atmospherics/binary/pump/high_power{ - dir = 4; + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ @@ -1092,6 +1145,19 @@ temperature = 278.15 }, /area/tajaran_smuggler) +"fOQ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cult/tome{ + desc = "A black stone altar dedicated to Minharrzka, the goddess of the waters and patroness of sailors."; + icon_state = "churchaltar"; + name = "altar" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/engine) "fQq" = ( /obj/effect/landmark/entry_point/port{ name = "port, airlock" @@ -1101,13 +1167,11 @@ }, /area/tajaran_smuggler) "fRI" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/tajaran_smuggler/hangar) +/obj/machinery/atmospherics/portables_connector/aux, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "fUw" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 @@ -1226,15 +1290,12 @@ }, /area/tajaran_smuggler/engine) "gqO" = ( -/obj/machinery/light/small/emergency{ - dir = 4 - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/tajaran_smuggler) "gsu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -1258,12 +1319,8 @@ }, /area/shuttle/tajaran_smuggler_cargo) "gyL" = ( -/obj/structure/fuel_port/hydrogen{ - pixel_x = -32 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary, +/turf/simulated/floor/plating, /area/shuttle/tajaran_smuggler) "gzB" = ( /obj/structure/table/standard, @@ -1292,7 +1349,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /turf/simulated/floor/airless, /area/shuttle/tajaran_smuggler_cargo) @@ -1334,7 +1391,7 @@ /area/shuttle/tajaran_smuggler_cargo) "gXD" = ( /obj/machinery/atmospherics/binary/pump/high_power{ - dir = 4; + dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ @@ -1424,24 +1481,31 @@ }, /area/tajaran_smuggler/bridge) "hxl" = ( -/obj/machinery/shipsensors/weak, -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/structure/railing/mapped{ +/obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/structure/railing/mapped{ - dir = 1 - }, -/turf/simulated/floor{ - temperature = 278.15 +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "hzg" = ( -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 8 }, +/obj/structure/closet/crate/internals, +/obj/item/storage/bag/inflatable, +/obj/item/device/oxycandle, +/obj/item/tank/emergency_oxygen{ + pixel_x = 5 + }, +/obj/item/tank/emergency_oxygen/engi{ + pixel_x = -3 + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "hAC" = ( /obj/machinery/firealarm/east, @@ -1489,6 +1553,13 @@ temperature = 278.15 }, /area/tajaran_smuggler/power) +"hOL" = ( +/obj/machinery/atmospherics/unary/engine, +/obj/effect/landmark/entry_point/aft{ + name = "aft engines, starboard" + }, +/turf/simulated/floor/airless, +/area/tajaran_smuggler/engine) "hPd" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -1512,8 +1583,20 @@ }, /area/tajaran_smuggler) "hTG" = ( -/turf/unsimulated/wall/fakepdoor, -/area/tajaran_smuggler/hangar) +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/shipsensors/weak{ + pixel_y = 4; + pixel_x = -1 + }, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/shuttle/tajaran_smuggler) "hVK" = ( /obj/machinery/light/small{ dir = 4 @@ -1644,18 +1727,8 @@ }, /area/tajaran_smuggler/dorms) "iCm" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "tajaran_smuggler_shuttle_out"; - dir = 4 - }, -/obj/effect/landmark/entry_point/east{ - name = "port, crew compartment" - }, -/turf/simulated/floor{ - temperature = 278.15 - }, +/obj/effect/landmark/entry_point/starboard, +/turf/simulated/wall/shuttle/raider, /area/shuttle/tajaran_smuggler) "iOh" = ( /obj/effect/decal/cleanable/blood/oil, @@ -1691,12 +1764,8 @@ }, /area/tajaran_smuggler/atmos) "iRD" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/obj/effect/landmark/entry_point/aft{ - name = "aft engines, port" - }, -/turf/simulated/floor/airless, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/shuttle/raider, /area/tajaran_smuggler/engine) "iSa" = ( /obj/structure/cable/green{ @@ -1916,6 +1985,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor{ temperature = 278.15 }, @@ -2039,7 +2113,7 @@ /turf/simulated/wall/shuttle/raider, /area/tajaran_smuggler/atmos) "kBu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 6 }, /turf/simulated/floor{ @@ -2124,13 +2198,28 @@ }, /area/shuttle/tajaran_smuggler_cargo) "kWZ" = ( -/obj/machinery/atmospherics/unary/engine, -/obj/structure/window/reinforced, -/obj/effect/landmark/entry_point/aft{ - name = "aft engines, starboard" +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1 }, -/turf/simulated/floor/airless, -/area/tajaran_smuggler/engine) +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = 12; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/tajaran_smuggler_shuttle, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "kYY" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/snacks/chipplate/tajcandy, @@ -2195,6 +2284,18 @@ temperature = 278.15 }, /area/tajaran_smuggler) +"lyG" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/tiled/dark, +/area/adhomian_circus/hangar) "lBm" = ( /obj/machinery/alarm/cold/north{ req_one_access = null @@ -2245,7 +2346,7 @@ "lNu" = ( /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2268,9 +2369,9 @@ /area/shuttle/tajaran_smuggler_cargo) "lOJ" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 8; + icon_state = "warning" }, -/obj/item/clothing/head/cone, /turf/simulated/floor{ temperature = 278.15 }, @@ -2328,13 +2429,22 @@ }, /area/tajaran_smuggler) "lXE" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 4; + icon_state = "warning" }, -/turf/simulated/floor/shuttle/black{ +/turf/simulated/floor{ temperature = 278.15 }, +/area/tajaran_smuggler/hangar) +"maM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "mcS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -2345,33 +2455,40 @@ }, /area/tajaran_smuggler/atmos) "mdc" = ( -/obj/machinery/vending/wallmed1{ - name = "Medical Supplies"; - pixel_x = -26; - pixel_y = -1; - req_access = null +/obj/machinery/door/airlock/external{ + dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = -28; + dir = 4 }, -/obj/structure/table/steel, -/obj/item/storage/bag/inflatable, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/shuttle_landmark/tajaran_smuggler/dock/port{ + dir = 4 }, -/area/shuttle/tajaran_smuggler) +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/tiled/dark, +/area/adhomian_circus/hangar) "mgd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/machinery/door/airlock/external{ + dir = 4 }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = 28; + dir = 4 }, -/turf/simulated/floor{ - temperature = 278.15 +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 }, -/area/tajaran_smuggler/engine) +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/tiled/dark, +/area/adhomian_circus/hangar) "mjj" = ( /obj/structure/cable/green{ d1 = 1; @@ -2408,12 +2525,10 @@ }, /area/shuttle/tajaran_smuggler_cargo) "msC" = ( -/obj/machinery/computer/ship/helm{ - req_access = null - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 }, +/turf/simulated/wall/shuttle/raider, /area/shuttle/tajaran_smuggler) "mwu" = ( /obj/structure/cable/green{ @@ -2443,27 +2558,31 @@ }, /area/tajaran_smuggler/hangar) "mEc" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "tajaran_smuggler_shuttle"; - name = "Port docking controller"; - pixel_x = 6; - pixel_y = 28; - tag_door = "tajaran_smuggler_shuttle_out" +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 }, -/obj/machinery/computer/ship/sensors{ - dir = 8 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/effect/map_effect/marker/airlock/shuttle/tajaran_smuggler_shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "mEw" = ( -/obj/effect/landmark/entry_point/port{ - name = "port, engine" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/wall/shuttle/raider, -/area/tajaran_smuggler/power) +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/hangar) "mET" = ( /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor{ @@ -2476,6 +2595,14 @@ temperature = 278.15 }, /area/tajaran_smuggler/engine) +"mJg" = ( +/obj/machinery/power/smes/buildable/third_party_shuttle, +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "mLa" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, @@ -2490,15 +2617,16 @@ }, /area/tajaran_smuggler/engine) "mWk" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "tajaran_smuggler_shuttle_out"; +/obj/machinery/computer/ship/engines/terminal{ dir = 4 }, -/turf/simulated/floor{ - temperature = 278.15 +/obj/machinery/light{ + dir = 8 }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "naX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2563,7 +2691,7 @@ }, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /obj/structure/plasticflaps/mining, /obj/machinery/door/blast/shutters{ @@ -2612,6 +2740,15 @@ temperature = 278.15 }, /area/tajaran_smuggler/dorms) +"nDR" = ( +/obj/effect/landmark/entry_point/port{ + name = "port, hangar" + }, +/obj/machinery/door/blast/regular, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/hangar) "nMF" = ( /obj/structure/cable/green{ d1 = 1; @@ -2638,11 +2775,14 @@ }, /area/tajaran_smuggler) "nVi" = ( -/obj/machinery/hologram/holopad/long_range, -/obj/effect/overmap/visitable/ship/landable/tajaran_smuggler_shuttle, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "nZg" = ( /obj/effect/landmark/entry_point/aft, @@ -2655,7 +2795,7 @@ }, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /obj/structure/cable/green{ d1 = 1; @@ -2698,8 +2838,9 @@ }, /area/tajaran_smuggler/dorms) "oie" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/wall/shuttle/raider, +/obj/effect/landmark/entry_point/fore, +/obj/effect/map_effect/window_spawner/full/shuttle/mercenary, +/turf/simulated/floor/plating, /area/shuttle/tajaran_smuggler) "ood" = ( /obj/structure/cable/green{ @@ -2738,12 +2879,8 @@ }, /area/tajaran_smuggler/hangar) "oqN" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/shuttle/raider, /area/shuttle/tajaran_smuggler) "oIi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2840,6 +2977,22 @@ temperature = 278.15 }, /area/tajaran_smuggler) +"pGP" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28; + pixel_x = 6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/plating, +/area/adhomian_circus/hangar) "pPq" = ( /obj/structure/cable/green{ d1 = 1; @@ -2917,10 +3070,8 @@ }, /area/tajaran_smuggler) "qbP" = ( -/obj/structure/closet/walllocker/emerglocker/west, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, +/obj/effect/landmark/entry_point/aft, +/turf/simulated/wall/shuttle/raider, /area/shuttle/tajaran_smuggler) "qcp" = ( /obj/structure/table/rack, @@ -2951,14 +3102,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor{ temperature = 278.15 }, /area/tajaran_smuggler/engine) +"qrf" = ( +/obj/machinery/atmospherics/unary/engine, +/obj/effect/landmark/entry_point/aft{ + name = "aft engines, port" + }, +/turf/simulated/floor/airless, +/area/tajaran_smuggler/engine) "qsb" = ( /obj/machinery/floodlight{ dir = 8 @@ -2968,17 +3123,15 @@ }, /area/shuttle/tajaran_smuggler_cargo) "qtV" = ( -/obj/effect/map_effect/airlock/w_to_e/long/square, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, /turf/simulated/wall/shuttle/raider, -/area/tajaran_smuggler/power) +/area/shuttle/tajaran_smuggler) "quc" = ( -/obj/structure/extinguisher_cabinet/west, -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, +/obj/machinery/atmospherics/binary/pump/fuel/on, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "que" = ( /obj/effect/step_trigger/teleporter, @@ -3029,13 +3182,20 @@ }, /area/tajaran_smuggler/power) "qPj" = ( -/obj/machinery/recharger/wallcharger{ - pixel_y = 24 +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/effect/landmark/entry_point/west{ - name = "starboard, crew compartment" +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/turf/simulated/wall/shuttle/raider, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 8 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "qVf" = ( /obj/structure/cable/green{ @@ -3124,7 +3284,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/machinery/conveyor{ dir = 8; - id = "tajara_smuggler"; + id = "tajara_smuggler" }, /turf/simulated/floor{ temperature = 278.15 @@ -3137,20 +3297,20 @@ }, /area/tajaran_smuggler) "rAo" = ( -/obj/machinery/atmospherics/portables_connector{ - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/shuttle/black{ +/obj/machinery/door/blast/regular, +/turf/simulated/floor{ temperature = 278.15 }, -/area/shuttle/tajaran_smuggler) +/area/tajaran_smuggler/hangar) "rCw" = ( -/obj/machinery/computer/shuttle_control/explore/tajaran_smuggler_shuttle{ - dir = 4 - }, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 +/obj/machinery/atmospherics/portables_connector/fuel, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/fuel_port/hydrogen{ + pixel_y = 28; + pixel_x = 6 }, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "rDk" = ( /obj/effect/floor_decal/industrial/warning, @@ -3212,6 +3372,20 @@ }, /turf/simulated/floor/airless, /area/tajaran_smuggler) +"sju" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/iff_beacon{ + pixel_y = 4 + }, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/airless, +/area/shuttle/tajaran_smuggler) "srj" = ( /obj/machinery/hologram/holopad/long_range, /obj/structure/cable/green{ @@ -3249,10 +3423,8 @@ }, /area/tajaran_smuggler/bridge) "sLj" = ( -/obj/machinery/atmospherics/binary/pump/high_power, -/turf/simulated/floor/shuttle/black{ - temperature = 278.15 - }, +/obj/structure/bed/stool/chair/shuttle, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "sOb" = ( /obj/effect/step_trigger/teleporter, @@ -3270,6 +3442,19 @@ temperature = 278.15 }, /area/tajaran_smuggler/engine) +"sZA" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/hangar{ + dir = 1 + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/hangar) "taq" = ( /obj/structure/bed/stool/bar/padded/red, /obj/effect/floor_decal/spline/fancy/wood{ @@ -3289,6 +3474,20 @@ temperature = 278.15 }, /area/tajaran_smuggler/atmos) +"tgZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + icon_state = "warning" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/hangar) "tju" = ( /obj/structure/cable/green{ d1 = 1; @@ -3392,6 +3591,42 @@ temperature = 278.15 }, /area/tajaran_smuggler) +"tIo" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_y = 6; + pixel_x = 20 + }, +/obj/machinery/airlock_sensor{ + pixel_x = 20; + dir = 8; + pixel_y = -6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/effect/floor_decal/industrial/outline_door/red, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_effect/marker/airlock/shuttle/tajaran_smuggler_shuttle, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/tajaran_smuggler) "tKM" = ( /obj/structure/table/stone/marble, /obj/item/reagent_containers/food/snacks/hardbread, @@ -3444,6 +3679,14 @@ temperature = 278.15 }, /area/tajaran_smuggler/engine) +"uqg" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/engine) "utm" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -3454,6 +3697,13 @@ temperature = 278.15 }, /area/tajaran_smuggler) +"uzP" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "uDR" = ( /obj/effect/shuttle_landmark/tajaran_smuggler_cargo/transit, /turf/space/transit/north, @@ -3549,11 +3799,13 @@ }, /area/tajaran_smuggler) "vtr" = ( -/obj/effect/shuttle_landmark/tajaran_smuggler/nav1, +/obj/effect/shuttle_landmark/tajaran_smuggler/nav1{ + dir = 8 + }, /turf/template_noop, /area/space) "vtM" = ( -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor{ temperature = 278.15 }, @@ -3622,16 +3874,14 @@ }, /area/shuttle/tajaran_smuggler_cargo) "vMF" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/effect/floor_decal/industrial/outline_door/red{ dir = 8 }, -/obj/machinery/floodlight{ - dir = 1 - }, -/turf/simulated/floor{ - temperature = 278.15 - }, -/area/tajaran_smuggler/hangar) +/obj/effect/floor_decal/industrial/outline_straight/red, +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/plating, +/area/adhomian_circus/hangar) "vMT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -3668,19 +3918,19 @@ /obj/effect/landmark/entry_point/fore{ name = "fore, bridge" }, -/obj/effect/map_effect/window_spawner/reinforced/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor{ temperature = 278.15 }, /area/tajaran_smuggler/bridge) "vTv" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/structure/bed/stool/chair/shuttle{ + dir = 4 }, -/obj/effect/landmark/entry_point/north{ - name = "aft, engines" +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 }, -/turf/unsimulated/floor/plating, +/turf/simulated/floor/tiled/dark, /area/shuttle/tajaran_smuggler) "waK" = ( /obj/machinery/vending/dinnerware, @@ -3690,11 +3940,23 @@ }, /area/tajaran_smuggler) "wbG" = ( -/obj/machinery/light/small, -/turf/simulated/floor{ - temperature = 278.15 +/obj/machinery/door/airlock/external{ + dir = 4 }, -/area/tajaran_smuggler/power) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = -28; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/tiled/dark, +/area/adhomian_circus/hangar) "wfy" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, @@ -3725,6 +3987,12 @@ temperature = 278.15 }, /area/shuttle/tajaran_smuggler_cargo) +"wmx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/tajaran_smuggler) "wnl" = ( /obj/machinery/light/small{ dir = 8 @@ -3762,6 +4030,17 @@ temperature = 278.15 }, /area/tajaran_smuggler/atmos) +"wNy" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/east{ + req_access = null + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "xdk" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, @@ -3834,6 +4113,14 @@ temperature = 278.15 }, /area/tajaran_smuggler/engine) +"xwF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/floor_decal/spline/plain/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/shuttle/tajaran_smuggler) "xwN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3861,6 +4148,14 @@ temperature = 278.15 }, /area/tajaran_smuggler/bridge) +"xHI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor{ + temperature = 278.15 + }, +/area/tajaran_smuggler/power) "xIN" = ( /obj/structure/bed/stool/bar/padded/red, /obj/effect/floor_decal/spline/fancy/wood{ @@ -3881,6 +4176,21 @@ temperature = 278.15 }, /area/tajaran_smuggler/power) +"xQL" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 2; + pixel_y = 28; + pixel_x = -6 + }, +/obj/effect/floor_decal/industrial/outline_door/red{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline_straight/red{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port, +/turf/simulated/floor/plating, +/area/adhomian_circus/hangar) "xRX" = ( /turf/template_noop, /area/space) @@ -32284,7 +32594,7 @@ xRX xRX xRX xRX -xRX +kJl kJl kJl kJl @@ -32541,10 +32851,10 @@ xRX xRX xRX xRX -xRX -bFk +bxR +iRD eEC -kJl +uqg kJl uhO uhO @@ -32798,10 +33108,10 @@ xRX xRX xRX xRX -xRX -kWZ +hOL +iRD iav -mgd +eEC kJl uhO uhO @@ -33055,8 +33365,8 @@ xRX xRX xRX xRX -xRX -bFk +bxR +iRD atB fji kJl @@ -33312,7 +33622,7 @@ xRX xRX xRX xRX -xRX +kJl kJl kJl iwP @@ -36154,18 +36464,18 @@ wrb pfE jOg yjW -bzW dQZ +tgZ +bzW bzW bzW -lOJ aaa -bzW lOJ -bzW -bzW -bzW -vMF +lOJ +lOJ +lOJ +lOJ +lOJ kmF jOg iOh @@ -36412,17 +36722,17 @@ pfE jOg vmq dHE +dFZ bci bci bci -bci -mWk +gyL iCm bci -bci -bci -bci -bci +sju +ilo +ilo +ilo rDk jOg lGQ @@ -36668,18 +36978,18 @@ wrb pfE jOg vmq -ilo -bci -bci +mEw +afL +qtV rCw quc +uzP hzg -hzg -qbP +bci gyL -mdc -oie -aou +bci +ilo +ilo mwV jOg lGQ @@ -36925,19 +37235,19 @@ wrb pfE jOg suI -ilo -eeP +mEw +bci msC oqN -hzg +xwF nVi -hzg -hzg -hzg -lXE -oie vTv -dyx +mWk +bFk +bci +bci +ilo +mwV jOg lGQ lGQ @@ -37182,19 +37492,19 @@ pfE pfE jOg vmq -ilo -bci -bci +sZA +kWZ +tIo mEc eTq gqO -eTq -rAo +aou +sLj sLj cdD oie -aou -mwV +ilo +dyx jOg lGQ eYk @@ -37439,18 +37749,18 @@ pfE pfE jOg vmq +ilo +qbP +eeP +bci +maM hxl -bci -bci -bci -bci -bci qPj aBb +eRD bci bci -bci -bci +ilo mwV jOg fQq @@ -37681,7 +37991,7 @@ xRX xRX xRX xRX -xRX +kJl kJl kJl iwP @@ -37695,20 +38005,20 @@ wrb wrb wrb jOg -hiw +vmq +ilo +afL +wmx fRI -fRI -fRI -fRI -fRI -fRI -fRI -fRI -fRI -fRI -fRI -fRI -akP +aJE +wNy +mJg +bci +gyL +bci +ilo +ilo +mwV jOg xRX xRX @@ -37938,34 +38248,34 @@ xRX xRX xRX xRX -xRX -bFk +bxR +iRD eEC iwP kJl izs +xHI izs -qtV wrb xRX xRX xRX xRX jOg -jOg -hTG -hTG -hTG -hTG -hTG -hTG +vmq +ilo +ilo +bci +bci +bci +bci bfG +bci hTG -hTG -hTG -hTG -hTG -jOg +ilo +ilo +ilo +mwV jOg xRX xRX @@ -38195,35 +38505,35 @@ xRX xRX xRX xRX -xRX +qrf iRD kaR qil -kJl -izs +wrb +lyG wbG -jWT -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +wrb +wrb xRX xRX xRX xRX +jOg +hiw +lXE +lXE +lXE +lXE +lXE +lXE +lXE +lXE +lXE +lXE +lXE +lXE +akP +jOg xRX xRX xRX @@ -38452,35 +38762,35 @@ xRX xRX xRX xRX -xRX -bFk bxR -kJl -jWT -izs -izs -jWT -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +iRD +qil +fOQ +wrb +pGP +vMF +wrb xRX xRX xRX xRX xRX +jOg +jOg +rAo +rAo +rAo +rAo +rAo +rAo +nDR +rAo +rAo +rAo +rAo +rAo +jOg +jOg xRX xRX xRX @@ -38709,14 +39019,14 @@ xRX xRX xRX xRX -xRX kJl kJl kJl -jWT -izs -izs -mEw +kJl +wrb +xQL +eaN +wrb xRX xRX xRX @@ -38970,10 +39280,10 @@ xRX xRX xRX xRX -xRX -xRX -xRX -xRX +wrb +mgd +mdc +wrb xRX xRX xRX @@ -41026,7 +41336,7 @@ xRX xRX xRX xRX -afL +xRX xRX xRX xRX diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_landmarks.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_landmarks.dm new file mode 100644 index 00000000000..0f646634d0f --- /dev/null +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_landmarks.dm @@ -0,0 +1,74 @@ +// --------------------- base type + +/obj/effect/shuttle_landmark/tajaran_smuggler + base_area = /area/space + base_turf = /turf/space + +// --------------------- shuttle + +/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/hangar + name = "Adhomian Freight Shuttle Hangar" + landmark_tag = "nav_tajaran_smuggler_shuttle" + docking_controller = "tajaran_smuggler_shuttle_dock" + base_area = /area/tajaran_smuggler/hangar + base_turf = /turf/simulated/floor/plating + movable_flags = MOVABLE_FLAG_EFFECTMOVE + +// ---- + +/obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/transit + name = "In transit" + landmark_tag = "nav_transit_tajaran_smuggler_shuttle" + base_turf = /turf/space/transit/north + +// --------------------- docks + +/obj/effect/shuttle_landmark/tajaran_smuggler/dock/port + name = "Dock, Port" + landmark_tag = "nav_tajaran_smuggler_dock_port" + docking_controller = "airlock_tajaran_smuggler_dock_port" + +/obj/effect/map_effect/marker/airlock/docking/tajaran_smuggler/dock/port + name = "Dock, Port" + landmark_tag = "nav_tajaran_smuggler_dock_port" + master_tag = "airlock_tajaran_smuggler_port" + +// --------------------- cargo + + +/datum/shuttle/autodock/overmap/tajaran_smuggler_cargo + name = "Adhomian Freight Cargo" + move_time = 20 + shuttle_area = list(/area/shuttle/tajaran_smuggler_cargo) + dock_target = "tajaran_smuggler_cargo" + current_location = "nav_tajaran_smuggler_cargo" + landmark_transition = "nav_transit_tajaran_smuggler_cargo" + range = 1 + fuel_consumption = 2 + logging_home_tag = "nav_tajaran_smuggler_cargo" + defer_initialisation = TRUE + +/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/hangar + name = "Adhomian Freight Cargo Hangar" + landmark_tag = "nav_tajaran_smuggler_cargo" + docking_controller = "tajaran_smuggler_cargo_dock" + base_area = /area/space + base_turf = /turf/space/dynamic + movable_flags = MOVABLE_FLAG_EFFECTMOVE + +/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/transit + name = "In transit" + landmark_tag = "nav_transit_tajaran_smuggler_cargo" + base_turf = /turf/space/transit/north + +/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav1 + name = "Cargo Hold - Port Side" + landmark_tag = "nav_tajaran_smuggler_cargo_1" + base_turf = /turf/space/dynamic + base_area = /area/space + +/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav2 + name = "Cargo Hold - Starboard Side" + landmark_tag = "nav_tajaran_smuggler_cargo_2" + base_turf = /turf/space/dynamic + base_area = /area/space diff --git a/maps/away/ships/wildlands_militia/militia_ship.dm b/maps/away/ships/wildlands_militia/militia_ship.dm index 9aad0b2ac9b..ee43162a0e9 100644 --- a/maps/away/ships/wildlands_militia/militia_ship.dm +++ b/maps/away/ships/wildlands_militia/militia_ship.dm @@ -2,7 +2,7 @@ name = "Militia Ship" description = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus." suffixes = list("ships/wildlands_milita/militia_ship.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) spawn_weight = 1 ship_cost = 1 id = "militia_ship" diff --git a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm index 33cd201dc30..6708bb7346e 100644 --- a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm @@ -89,15 +89,15 @@ /area/exoplanet/adhomai) "ko" = ( /obj/item/trash/grease, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, +/area/exoplanet/adhomai) +"kw" = ( +/obj/machinery/door/urban, +/turf/simulated/floor/exoplanet/wood, /area/exoplanet/adhomai) "kB" = ( /obj/item/trash/can/adhomian_can, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "kJ" = ( /obj/structure/closet/crate/freezer, @@ -121,9 +121,7 @@ }, /area/exoplanet/adhomai) "nR" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "qm" = ( /obj/structure/bed/padded, @@ -142,9 +140,7 @@ /area/exoplanet/adhomai) "sS" = ( /obj/item/trash/broken_electronics, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "uc" = ( /obj/structure/railing/fence, @@ -167,9 +163,7 @@ /area/exoplanet/adhomai) "xc" = ( /obj/structure/closet/crate/trashcart, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "xn" = ( /obj/structure/bed/stool/chair/wood{ @@ -226,21 +220,15 @@ /area/exoplanet/adhomai) "DP" = ( /obj/machinery/light/small, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Fz" = ( /obj/structure/sink/puddle, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "FM" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Gu" = ( /turf/simulated/wall/wood, @@ -253,9 +241,7 @@ /area/exoplanet/adhomai) "Ht" = ( /obj/item/material/shard, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "HX" = ( /obj/structure/bed/stool/chair/sofa/right/brown, @@ -274,9 +260,7 @@ /obj/structure/railing/fence{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Jb" = ( /obj/item/material/shard/wood, @@ -286,9 +270,13 @@ /area/exoplanet/adhomai) "KV" = ( /obj/item/material/shard/wood, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 +/turf/simulated/floor/exoplanet/snow/cold, +/area/exoplanet/adhomai) +"Mb" = ( +/obj/machinery/door/urban{ + dir = 8 }, +/turf/simulated/floor/exoplanet/wood, /area/exoplanet/adhomai) "Oa" = ( /obj/structure/reagent_dispensers/keg/mead, @@ -393,9 +381,7 @@ /area/exoplanet/adhomai) "YV" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Zi" = ( /obj/structure/railing/fence{ @@ -590,7 +576,7 @@ WK Rh Rh Rh -rf +kw WK WK WK @@ -1074,10 +1060,10 @@ nR nR nR Rh -rf +kw WK WK -rf +kw WK Wa Wa @@ -1099,7 +1085,7 @@ Gu Gu Gu Gu -rf +Mb Gu Gu wj @@ -1168,7 +1154,7 @@ WK WK WK WK -rf +kw Aq Aq Aq diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm index a0fd8ac534c..0c5e5688547 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_abandoned_labor_camp.dmm @@ -16,17 +16,9 @@ temperature = 268.15 }, /area/exoplanet/adhomai) -"cw" = ( -/obj/structure/simple_door, -/turf/simulated/floor/concrete/square{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) "ds" = ( /obj/machinery/light, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "ef" = ( /obj/item/reagent_containers/glass/bucket/wood{ @@ -36,7 +28,8 @@ pixel_x = 9 }, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/concrete/square{ temperature = 268.15 @@ -44,11 +37,10 @@ /area/exoplanet/adhomai) "ev" = ( /obj/structure/sign/flag/pra{ - pixel_x = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_x = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "ew" = ( /obj/machinery/shower{ @@ -93,13 +85,13 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "gz" = ( /obj/machinery/vending/cigarette, -/obj/structure/sign/flag/pra/large/west, +/obj/structure/sign/flag/pra/large/west{ + pixel_x = -32 + }, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, @@ -141,9 +133,7 @@ /obj/structure/blocker/steel/fence{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "kI" = ( /obj/effect/floor_decal/concrete{ @@ -189,9 +179,7 @@ }, /area/exoplanet/adhomai) "mC" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "mF" = ( /obj/effect/decal/cleanable/dirt, @@ -215,18 +203,11 @@ temperature = 268.15 }, /area/exoplanet/adhomai) -"nR" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) "ot" = ( /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "ov" = ( /obj/structure/hadii_statue/stone{ @@ -256,16 +237,14 @@ }, /area/exoplanet/adhomai) "qI" = ( -/obj/structure/sign/flag/pra/large/north, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "qW" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "rf" = ( /obj/structure/closet/crate/freezer, @@ -318,9 +297,7 @@ /area/exoplanet/adhomai) "vw" = ( /obj/structure/closet/outhouse, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "vB" = ( /obj/effect/floor_decal/concrete, @@ -344,7 +321,8 @@ "wx" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/concrete/square{ temperature = 268.15 @@ -379,11 +357,10 @@ /area/exoplanet/adhomai) "yd" = ( /obj/structure/sign/flag/pra{ - pixel_y = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "yA" = ( /obj/effect/floor_decal/concrete/large/cee{ @@ -456,7 +433,8 @@ /obj/effect/floor_decal/industrial/outline/security, /obj/item/gun/projectile/shotgun/pump/rifle, /obj/structure/sign/flag/pra{ - pixel_y = -32 + pixel_y = -32; + stand_icon = null }, /turf/simulated/floor/concrete/square{ temperature = 268.15 @@ -504,15 +482,15 @@ /area/exoplanet/adhomai) "FM" = ( /obj/structure/flora/grass/brown, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Gu" = ( /turf/simulated/wall/wood, /area/exoplanet/adhomai) "GB" = ( -/obj/structure/sign/flag/pra/large/west, +/obj/structure/sign/flag/pra/large/west{ + pixel_x = -32 + }, /obj/effect/floor_decal/concrete{ dir = 9 }, @@ -577,9 +555,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Jb" = ( /obj/effect/decal/cleanable/dirt, @@ -589,20 +565,13 @@ /area/exoplanet/adhomai) "KV" = ( /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, /area/exoplanet/adhomai) -"Lz" = ( -/obj/effect/floor_decal/concrete{ - dir = 9 - }, -/turf/simulated/floor/concrete{ - temperature = 268.15 - }, -/area/exoplanet/adhomai) "LT" = ( /obj/effect/floor_decal/concrete/large, /turf/simulated/floor/concrete{ @@ -653,14 +622,10 @@ /obj/structure/blocker/steel/fence{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Qe" = ( -/obj/structure/simple_door{ - initial_lock_value = "labor_barracks" - }, +/obj/machinery/door/urban, /turf/simulated/floor/concrete{ temperature = 268.15 }, @@ -702,7 +667,8 @@ "Tp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /obj/item/handcuffs, /turf/simulated/floor/concrete/square{ @@ -746,17 +712,14 @@ dir = 4; status = 2 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Xv" = ( /obj/structure/sign/flag/pra{ - pixel_y = 32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = 32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "XT" = ( /obj/machinery/door/blast/shutters{ @@ -776,9 +739,7 @@ }, /area/exoplanet/adhomai) "Yn" = ( -/obj/structure/simple_door{ - initial_lock_value = "labor_barracks" - }, +/obj/machinery/door/urban, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, @@ -854,164 +815,164 @@ jg Xv "} (2,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC ds jg jg ot -nR -nR +mC +mC kB -nR +mC "} (3,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC rf sS -Lz +sS GB sS LT -nR +mC kB -nR +mC "} (4,1,1) = {" -nR +mC kB -nR -nR +mC +mC vw -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC Rh Sg eU fq Sg WK -nR +mC kB -nR +mC "} (5,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC Rh Sg fq fq Sg WK -nR +mC kB -nR +mC "} (6,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC Xk Rh Sg @@ -1021,13 +982,13 @@ Sg WK Xk kB -nR +mC "} (7,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu Gu @@ -1035,17 +996,17 @@ Gu Gu Gu Xv -nR -nR -nR -nR +mC +mC +mC +mC Gu Gu Gu Gu -nR -nR -nR +mC +mC +mC jg Fz Sg @@ -1055,13 +1016,13 @@ Sg mR jg kB -nR +mC "} (8,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc zf @@ -1071,15 +1032,15 @@ Yn yV kI LT -nR +mC Gu Gu HX am Gu Gu -nR -nR +mC +mC IO Rh Sg @@ -1089,13 +1050,13 @@ Sg WK IO kB -nR +mC "} (9,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu zf @@ -1112,41 +1073,41 @@ Wa zf Pa Gu -nR -nR -nR +mC +mC +mC Rh Sg fq BZ Sg WK -nR +mC kB -nR +mC "} (10,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc zf zf TQ Gu -nR +mC Rh vB Zf -cw +Yn zf zf zf GR Gu -nR +mC BP sS uU @@ -1155,22 +1116,22 @@ fq fq Sg WK -nR +mC kB -nR +mC "} (11,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu wx zf Gu Gu -nR +mC Rh WK yd @@ -1180,7 +1141,7 @@ Wa Wa Ht Gu -nR +mC Rh hm pU @@ -1189,124 +1150,124 @@ pU pU pU ZL -nR +mC kB -nR +mC "} (12,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc Wa zf TQ Gu -nR +mC Rh WK -nR +mC Gu Gu kJ xn Gu Gu -nR +mC Rh WK -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC kB -nR +mC "} (13,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu zf rM Gu Gu -nR +mC Rh WK -nR -nR +mC +mC Gu Gu Gu Gu -nR -nR +mC +mC Rh WK -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC kB -nR +mC "} (14,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu zh zf zf TQ Gu -nR +mC Rh WK -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC Rh WK -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC kB -nR +mC "} (15,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu KV Wa Gu Gu -nR +mC Rh WK yd @@ -1315,32 +1276,32 @@ Gu Gu Gu Gu -nR -nR +mC +mC Rh WK -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC kB -nR +mC "} (16,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc IM zf TQ Gu -nR +mC Rh Yc Zf @@ -1349,32 +1310,32 @@ Jb TD fZ Gu -nR -nR +mC +mC Rh WK -nR -nR +mC +mC jg jg jg jg -nR +mC kB -nR +mC "} (17,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu zf rM Gu Gu -nR +mC Rh WK yd @@ -1383,42 +1344,42 @@ Gu Jb Gu Gu -nR -nR +mC +mC Rh WK -nR -nR +mC +mC jg Cw mF jg jg kB -nR +mC "} (18,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc zf zf TQ Gu -nR +mC Rh WK -nR +mC Gu Rw Aq ew Gu -nR -nR +mC +mC Rh WK yd @@ -1432,27 +1393,27 @@ kB FM "} (19,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu Tp zf Gu Gu -nR +mC Rh WK -nR +mC Gu Gu Aq Gu Gu qI -nR +mC Rh vB Zf @@ -1463,30 +1424,30 @@ zf Cc jg kB -nR +mC "} (20,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc zf Wa TQ Gu -nR +mC Rh WK -nR +mC Gu Rw Aq ew Gu mC -nR +mC Rh WK yd @@ -1497,101 +1458,101 @@ zf Zi jg kB -nR +mC "} (21,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu zf rM Gu Gu -nR +mC Rh WK -nR +mC Gu Gu Jb Gu Gu -nR -nR +mC +mC Rh WK -nR -nR +mC +mC jg jg jg jg jg kB -nR +mC "} (22,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu mf zf zf TQ Gu -nR +mC Rh WK -nR +mC Gu Rw Ic ew Gu -nR -nR +mC +mC Rh WK -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC kB -nR +mC "} (23,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu ef zf Gu Gu -nR +mC Rh WK -nR +mC Gu Gu Gu Gu Gu -nR -nR +mC +mC Rh WK -nR +mC jg jg jg @@ -1599,33 +1560,33 @@ jg jg jg kB -nR +mC "} (24,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc zf zf TQ Gu -nR +mC Rh WK -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC Rh WK -nR +mC jg YV YQ @@ -1633,33 +1594,33 @@ gz uc jg kB -nR +mC "} (25,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu zf rM Gu Gu -nR +mC Rh WK -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC Rh WK -nR +mC jg zA jr @@ -1667,33 +1628,33 @@ eS rM jg kB -nR +mC "} (26,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Oc zf zf TQ Gu -nR +mC Rh WK -nR -nR -nR +mC +mC +mC ov -nR -nR -nR -nR +mC +mC +mC +mC Rh WK -nR +mC jg kO ko @@ -1701,54 +1662,54 @@ jg aa jg kB -nR +mC "} (27,1,1) = {" -nR +mC kB -nR -nR +mC +mC Gu Gu Gu Gu Gu Gu -nR +mC Rh WK -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC Rh WK -nR +mC gm xc Iv ev yA -nR +mC jg Xv "} (28,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC Rh sQ sS @@ -1772,17 +1733,17 @@ XT HM "} (29,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC Ci pU pU @@ -1806,72 +1767,72 @@ OA pU "} (30,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC jg Xv "} (31,1,1) = {" -nR +mC kB -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC +mC kB -nR +mC "} (32,1,1) = {" yd diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm index 84d1b69fbb6..be4bc50624a 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_amohdan.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "m" = ( /obj/structure/bed/stool/wood, @@ -10,34 +8,24 @@ identifier = "adhomai_amohdan"; name = "igs - adhomai_amohdan" }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "z" = ( /obj/item/stack/medical/bruise_pack/full, /obj/item/stack/medical/bruise_pack/full, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/structure/bonfire/light_up, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm index f61737d6d32..0fbca3c6eb1 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dm @@ -17,6 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "Digging equipment is scattered around the camp. Royalist flags hang from the tents." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm index 75583064f7f..b2d30ada255 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm @@ -9,15 +9,11 @@ /turf/simulated/floor/exoplanet/carpet/rubber, /area/adhomai_archeology) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "d" = ( /obj/structure/closet/crate/miningcart, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "f" = ( /obj/structure/closet/crate/freezer, @@ -40,9 +36,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 12 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "k" = ( /obj/effect/floor_decal/industrial/warning{ @@ -53,11 +47,10 @@ /area/adhomai_archeology) "m" = ( /obj/structure/sign/flag/nka{ - pixel_y = 32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = 32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "n" = ( /obj/effect/floor_decal/industrial/warning{ @@ -80,9 +73,7 @@ name = "igs - adhomai_archeology" }, /obj/structure/bed/stool/wood, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "q" = ( /obj/structure/curtain/open, @@ -99,18 +90,15 @@ /area/adhomai_archeology) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "t" = ( /obj/machinery/floodlight, /obj/structure/sign/flag/nka{ - pixel_y = 32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = 32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "u" = ( /obj/structure/table/rack, @@ -127,9 +115,7 @@ /area/adhomai_archeology) "v" = ( /obj/structure/bonfire/light_up, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "w" = ( /obj/structure/closet/crate, @@ -164,12 +150,10 @@ /area/adhomai_archeology) "C" = ( /obj/structure/flora/rock/ice, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "E" = ( -/turf/simulated/wall/cloth, +/turf/simulated/wall/wood, /area/adhomai_archeology) "F" = ( /obj/structure/closet/crate/secure/large, @@ -180,9 +164,7 @@ /area/adhomai_archeology) "H" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "I" = ( /obj/machinery/light/small{ @@ -205,19 +187,17 @@ /area/adhomai_archeology) "O" = ( /obj/structure/sign/flag/nka{ - pixel_x = 32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_x = 32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/structure/sign/flag/nka{ - pixel_x = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_x = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Q" = ( /obj/machinery/light/small{ @@ -228,9 +208,7 @@ /area/adhomai_archeology) "R" = ( /obj/machinery/floodlight, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "S" = ( /turf/simulated/floor/exoplanet/carpet/rubber, @@ -238,11 +216,10 @@ "U" = ( /obj/structure/closet/crate/miningcart, /obj/structure/sign/flag/nka{ - pixel_x = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_x = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "V" = ( /obj/structure/reagent_dispensers/coolanttank, @@ -258,15 +235,11 @@ /area/adhomai_archeology) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Y" = ( /obj/item/trash/cigbutt/cigarbutt, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Z" = ( /obj/structure/bed/stool/chair/office/dark{ diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm index 6f83bcafd32..07c1285f46c 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dm @@ -17,6 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "A typical Adhomian inn. The scent of alcohol and cigarette smoke as well as the warmth welcomes you." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm index 62b8eebc48e..547d2b6c2ab 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm @@ -5,11 +5,8 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "am" = ( -/obj/structure/simple_door/wood{ - name = "room five"; - initial_lock_value = "room_five" - }, -/turf/simulated/floor/carpet/brown, +/obj/item/storage/altar/rredouane, +/turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "aK" = ( /obj/structure/closet/crate/hydroponics, @@ -29,34 +26,7 @@ "bm" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/wood, -/obj/item/key{ - name = "key - room one"; - key_data = "room_one" - }, -/obj/item/key{ - name = "key - room two"; - key_data = "room_two" - }, -/obj/item/key{ - name = "key - room three"; - key_data = "room_three" - }, -/obj/item/key{ - name = "key - room four"; - key_data = "room_four" - }, -/obj/item/key{ - name = "key - room five"; - key_data = "room_five" - }, -/obj/item/key{ - name = "key - room six"; - key_data = "room_six" - }, -/obj/item/key{ - name = "key - storeroom"; - key_data = "storeroom" - }, +/obj/item/key/door_key, /turf/simulated/floor/exoplanet/tiled/white, /area/adhomai_bar) "cs" = ( @@ -86,17 +56,8 @@ /obj/item/trash/can/adhomian_can, /obj/item/storage/bag/trash, /obj/item/storage/bag/trash, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) -"eu" = ( -/obj/structure/simple_door/wood{ - name = "room one"; - initial_lock_value = "room_one" - }, -/turf/simulated/floor/carpet/brown, -/area/adhomai_bar) "ev" = ( /obj/structure/bed/stool/chair/wood{ dir = 1 @@ -264,17 +225,8 @@ temperature = 253.15 }, /area/adhomai_bar) -"ng" = ( -/obj/structure/simple_door/wood{ - name = "room four"; - initial_lock_value = "room_four" - }, -/turf/simulated/floor/carpet/brown, -/area/adhomai_bar) "nR" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "oq" = ( /obj/structure/coatrack, @@ -304,9 +256,7 @@ pixel_y = 32; desc = "An ancient icon representing Adhomai's suns." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "pr" = ( /obj/machinery/light/small{ @@ -385,6 +335,7 @@ "sE" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, +/obj/item/key/door_key, /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "tf" = ( @@ -554,13 +505,6 @@ /obj/item/material/minihoe, /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) -"Eg" = ( -/obj/structure/simple_door/wood{ - name = "room six"; - initial_lock_value = "room_six" - }, -/turf/simulated/floor/carpet/brown, -/area/adhomai_bar) "Ez" = ( /obj/structure/bed/stool/bar/padded/red, /turf/simulated/floor/exoplanet/wood, @@ -593,9 +537,7 @@ /area/adhomai_bar) "FM" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "FS" = ( /obj/structure/bed/stool/chair/wood{ @@ -607,7 +549,9 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "Gf" = ( -/obj/structure/simple_door/wood, +/obj/machinery/door/urban{ + dir = 4 + }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15 @@ -637,13 +581,6 @@ temperature = 253.15 }, /area/adhomai_bar) -"HX" = ( -/obj/structure/simple_door/wood{ - name = "room two"; - initial_lock_value = "room_two" - }, -/turf/simulated/floor/carpet/brown, -/area/adhomai_bar) "In" = ( /turf/simulated/floor/exoplanet/barren{ temperature = 268.15 @@ -734,9 +671,7 @@ /area/adhomai_bar) "NM" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Ow" = ( /obj/structure/table/wood/gamblingtable, @@ -770,9 +705,8 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "Qw" = ( -/obj/structure/simple_door/wood{ - name = "room three"; - initial_lock_value = "room_three" +/obj/machinery/door/urban{ + dir = 8 }, /turf/simulated/floor/carpet/brown, /area/adhomai_bar) @@ -875,10 +809,7 @@ }, /area/adhomai_bar) "TB" = ( -/obj/structure/simple_door/wood{ - name = "storeroom"; - initial_lock_value = "storeroom" - }, +/obj/machinery/door/urban, /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "TJ" = ( @@ -949,7 +880,9 @@ /turf/simulated/floor/exoplanet/lino/diamond, /area/adhomai_bar) "Wk" = ( -/obj/structure/simple_door/wood, +/obj/machinery/door/urban{ + dir = 8 + }, /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "Wm" = ( @@ -1015,9 +948,7 @@ /area/adhomai_bar) "XG" = ( /obj/structure/closet/outhouse, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Yn" = ( /obj/structure/bed/stool/chair/wood{ @@ -1044,9 +975,7 @@ /area/adhomai_bar) "YP" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "YY" = ( /obj/structure/table/rack, @@ -1090,7 +1019,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_bar) "Zw" = ( -/obj/structure/simple_door/wood, +/obj/machinery/door/urban, /turf/simulated/floor/exoplanet/tiled/white, /area/adhomai_bar) "ZT" = ( @@ -1397,7 +1326,7 @@ xn DC xn xn -Wk +TB Jy gm gm @@ -1820,11 +1749,11 @@ Qw Xv Xv Xv -HX +Qw Xv Xv Xv -eu +Qw Xv Xv JZ @@ -1904,7 +1833,7 @@ JZ JZ JZ JZ -Wk +TB JZ JZ JZ @@ -1933,15 +1862,15 @@ oq ah Xv Xv -Eg +Qw Xv Xv Xv -am +Qw Xv Xv Xv -ng +Qw Xv Xv JZ @@ -1959,7 +1888,7 @@ JZ JZ JZ JZ -Wk +TB Rh Rh "} @@ -2293,7 +2222,7 @@ Xv Xv Xv Xv -Xv +am Xv Xv Xv @@ -2331,9 +2260,9 @@ nR nR nR nR -nR -nR -nR +Xv +Xv +Xv nR nR nR diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm index 42d7daa2cbb..036984e2228 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_battlefield.dmm @@ -2,99 +2,69 @@ "a" = ( /obj/effect/landmark/corpse/pra_soldier, /obj/structure/pit/closed, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "b" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "i" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/item/gun/projectile/pistol/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "k" = ( /obj/item/ammo_casing/pistol/used, /obj/item/ammo_casing/pistol/used, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "m" = ( /turf/simulated/mineral/adhomai, /area/exoplanet/adhomai) "n" = ( /obj/item/material/shard/shrapnel, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "o" = ( /obj/structure/pit/closed, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "s" = ( /obj/item/gun/projectile/shotgun/pump/rifle, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "t" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/item/ammo_casing/pistol/used, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "u" = ( /obj/item/ammo_casing/pistol/used, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "A" = ( /obj/effect/landmark/corpse/pra_soldier, /obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "C" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "F" = ( /obj/item/gun/projectile/pistol/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "G" = ( /obj/item/grenade/frag, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "N" = ( /obj/effect/decal/fake_object{ @@ -103,35 +73,25 @@ name = "adhomian tank wreck"; desc = "The remnants of a second revolution-era tank." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "O" = ( /obj/effect/landmark/corpse/pra_soldier, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/item/ammo_casing/rifle/used, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "U" = ( /obj/item/ammo_casing/rifle/used, /obj/item/ammo_casing/rifle/used, /obj/item/ammo_casing/rifle/used, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm index d8b2f6d221f..393afebf3c0 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern.dmm @@ -5,9 +5,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "k" = ( /obj/structure/flora/rock/ice, @@ -18,15 +16,11 @@ /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "A" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -34,9 +28,7 @@ /area/exoplanet/adhomai) "C" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /turf/simulated/floor/exoplanet/mineral/adhomai, @@ -47,9 +39,7 @@ /area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm index 51c0d7ac4e8..d071863a2a1 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_cavern_geist.dmm @@ -12,9 +12,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "k" = ( /obj/structure/flora/rock/ice, @@ -25,15 +23,11 @@ /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "A" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -41,18 +35,14 @@ /area/exoplanet/adhomai) "C" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm index cfe54550dd2..d684471efba 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_chemical_testing.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "k" = ( /obj/effect/decal/cleanable/acid_remnants, @@ -13,33 +11,23 @@ /area/exoplanet/adhomai) "u" = ( /obj/structure/reagent_dispensers/acid_barrel, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "A" = ( /obj/effect/decal/cleanable/acid_remnants, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "M" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm index 0b55b96e2dc..ea0ec0a14be 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_deserter.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "m" = ( /obj/structure/bed/stool/wood, @@ -10,27 +8,19 @@ identifier = "adhomai_deserter"; name = "igs - adhomai_deserter" }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/structure/bonfire/light_up, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm index aa28c8192f0..6eb3559297a 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dm @@ -15,3 +15,4 @@ base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC + area_blurb = "The droning of machinery fills the bunker. These walls are made to survive the end of the world." diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm index 287aae4f265..39c7c0b7fe0 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_fallout_bunker.dmm @@ -38,7 +38,8 @@ /area/adhomai_fallout_bunker) "bu" = ( /obj/structure/sign/flag/pra{ - pixel_y = -32 + pixel_y = -32; + stand_icon = null }, /obj/effect/floor_decal/corner/red{ dir = 10 @@ -51,9 +52,7 @@ /obj/structure/blocker/steel/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "bU" = ( /turf/simulated/wall/r_wall, @@ -266,21 +265,14 @@ /area/adhomai_fallout_bunker) "kj" = ( /obj/machinery/light/small, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/adhomai_fallout_bunker) -"kG" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white{ - temperature = 278.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "kH" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/bed/stool/bar/padded/red, -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/white{ temperature = 278.15 }, @@ -309,7 +301,9 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -514,7 +508,9 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/structure/sign/flag/pra/large/south, +/obj/structure/sign/flag/pra/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/tiled{ temperature = 278.15 }, @@ -587,9 +583,7 @@ /area/adhomai_fallout_bunker) "tb" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "ua" = ( /obj/machinery/button/remote/blast_door{ @@ -599,9 +593,7 @@ name = "Bunker Entry"; id = "bunker_door" }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "uq" = ( /obj/machinery/door/airlock/highsecurity{ @@ -807,11 +799,10 @@ /area/adhomai_fallout_bunker) "At" = ( /obj/structure/sign/flag/pra{ - pixel_y = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "AY" = ( /obj/structure/table/rack, @@ -850,13 +841,6 @@ temperature = 278.15 }, /area/adhomai_fallout_bunker) -"BQ" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/bed/stool/bar/padded/red, -/turf/simulated/floor/tiled/white{ - temperature = 278.15 - }, -/area/adhomai_fallout_bunker) "Cd" = ( /obj/machinery/light/small{ brightness_color = "#FA8282"; @@ -869,14 +853,6 @@ temperature = 278.15 }, /area/adhomai_fallout_bunker) -"Cj" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomai_fallout_bunker) "Cq" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz, @@ -941,9 +917,7 @@ dir = 4; uid = "bunker_entry" }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "EM" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -1065,25 +1039,6 @@ temperature = 278.15 }, /area/adhomai_fallout_bunker) -"Iw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomai_fallout_bunker) -"IA" = ( -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomai_fallout_bunker) "Jb" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/bed/stool/bar/padded/red, @@ -1111,9 +1066,7 @@ }, /area/adhomai_fallout_bunker) "Kn" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "KG" = ( /obj/structure/table/standard, @@ -1166,9 +1119,7 @@ id = "bunker_door"; dir = 2 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_fallout_bunker) "MM" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -1203,7 +1154,9 @@ dir = 1; icon_state = "rwindow" }, -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /obj/effect/floor_decal/corner/red/full{ dir = 8 }, @@ -1211,18 +1164,8 @@ temperature = 278.15 }, /area/adhomai_fallout_bunker) -"NN" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled{ - temperature = 278.15 - }, -/area/adhomai_fallout_bunker) "Oi" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "OG" = ( /obj/effect/floor_decal/corner/red{ @@ -1277,7 +1220,9 @@ }, /area/adhomai_fallout_bunker) "Qk" = ( -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -1491,7 +1436,9 @@ /obj/effect/floor_decal/corner/red{ dir = 10 }, -/obj/structure/sign/flag/pra/large/south, +/obj/structure/sign/flag/pra/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -1834,7 +1781,7 @@ bU bU bU bU -IA +oI af VB bU @@ -1866,7 +1813,7 @@ hR ke MM Ym -IA +oI af qA bU @@ -1894,11 +1841,11 @@ Ub Bj bU kH -kG mZ -BQ +mZ +pF Rg -IA +oI af Sj bU @@ -1928,9 +1875,9 @@ bU pF Nv Ys -BQ +pF Rg -IA +oI af yG bU @@ -1949,20 +1896,20 @@ nl wc rk sL -NN -NN +kd +kd wb nT -Iw +ol af nu bU UI Jb -BQ +pF Rg Rg -IA +oI af wn bU @@ -1990,10 +1937,10 @@ af bu bU wj -Cj -Cj -Cj -Cj +Ub +Ub +Ub +Ub OG af sc @@ -2021,7 +1968,7 @@ xa af aJ fk -IA +oI af af af @@ -2055,12 +2002,12 @@ bu bU rG fJ -NN +kd fJ -NN +kd fJ -NN -NN +kd +kd KY bU Kn diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm index 2bea63f6417..3d53eb6380e 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dm @@ -17,6 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "Multiple huntings trophies decorate this place. The lodge smells of fresh meat and blood." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm index 808822b4f27..57d9ece432e 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_hunting.dmm @@ -3,21 +3,19 @@ /obj/structure/railing/fence{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "bP" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "bR" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, +/area/exoplanet/adhomai) +"dy" = ( +/obj/machinery/door/urban, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "ey" = ( /obj/structure/railing/mapped{ @@ -39,13 +37,6 @@ /obj/item/trap, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) -"he" = ( -/obj/structure/window/basic{ - dir = 4 - }, -/obj/structure/curtain/black, -/turf/simulated/floor/exoplanet/wood, -/area/adhomai_hunting) "hD" = ( /obj/structure/table/wood, /obj/item/toy/plushie/farwa, @@ -53,15 +44,11 @@ /area/adhomai_hunting) "jh" = ( /obj/machinery/light/small, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "jk" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "jy" = ( /obj/structure/railing/mapped, @@ -79,9 +66,7 @@ /mob/living/simple_animal/hostile/commanded/dog/harron{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "kO" = ( /obj/structure/table/wood, @@ -94,10 +79,8 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "le" = ( -/obj/structure/window/basic{ - dir = 8 - }, /obj/structure/curtain/black, +/obj/effect/map_effect/window_spawner/full/wood, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "lh" = ( @@ -167,9 +150,7 @@ /obj/structure/railing/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "sU" = ( /obj/structure/table/wood/gamblingtable, @@ -183,9 +164,7 @@ /area/adhomai_hunting) "vq" = ( /obj/structure/sink/puddle, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "wa" = ( /obj/effect/decal/fake_object{ @@ -203,15 +182,11 @@ /obj/item/seeds/nifberries, /obj/item/seeds/sugartree, /obj/item/seeds/earthenroot, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "xH" = ( /obj/structure/flora/rock/ice, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "zC" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -222,9 +197,7 @@ pixel_x = -9; pixel_y = 5 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "BM" = ( /obj/structure/table/wood, @@ -238,25 +211,19 @@ /obj/structure/railing/fence{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "CX" = ( /mob/living/simple_animal/hostile/commanded/dog/harron{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Dt" = ( /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_hunting) "DP" = ( /obj/structure/cult/tome{ @@ -268,6 +235,7 @@ desc = "An expensive silver charm of tajaran origin. This one has the arrowhead of Ma'take"; name = "mata'ke charm" }, +/obj/item/nullrod/matake, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "DY" = ( @@ -276,14 +244,10 @@ /area/adhomai_hunting) "EB" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Hj" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "HC" = ( /obj/machinery/appliance/cooker/oven/adhomai, @@ -299,9 +263,7 @@ /mob/living/simple_animal/hostile/commanded/dog/harron{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Lc" = ( /turf/simulated/floor/carpet/art{ @@ -327,6 +289,16 @@ }, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) +"Nu" = ( +/obj/machinery/door/urban{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/wood, +/area/adhomai_hunting) +"PH" = ( +/obj/structure/sign/flag/matake, +/turf/simulated/floor/exoplanet/wood, +/area/adhomai_hunting) "Sm" = ( /obj/machinery/light/small{ dir = 8 @@ -357,10 +329,10 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "VA" = ( -/turf/simulated/floor/exoplanet/ice, +/turf/simulated/floor/exoplanet/ice/cold, /area/exoplanet/adhomai) "VL" = ( -/obj/structure/simple_door/wood, +/obj/machinery/door/urban, /turf/simulated/floor/exoplanet/wood, /area/adhomai_hunting) "VU" = ( @@ -402,9 +374,7 @@ /obj/structure/railing/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" @@ -832,7 +802,7 @@ qU Vo rg rg -VL +Nu rg wj Hj @@ -857,7 +827,7 @@ Hj Hj rg rg -qU +PH Sm VU qU @@ -971,7 +941,7 @@ qU DY rg rg -he +le rg rg Hj @@ -993,7 +963,7 @@ Hj Hj rg rg -qU +PH IE ey qU @@ -1070,7 +1040,7 @@ rg hD qU Lc -lh +Xy rg Hj Hj @@ -1130,7 +1100,7 @@ Hj Hj Hj Hj -Hj +dy KI Hj jh @@ -1138,7 +1108,7 @@ rg kO IE Lc -Xy +lh rg Hj Hj @@ -1171,7 +1141,7 @@ CX rg rg rg -he +le rg rg Hj diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm index 1e702ee4e56..0c9e13e9c22 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_minefield.dmm @@ -1,14 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "k" = ( /turf/simulated/mineral/random/high_chance/adhomai, @@ -18,39 +14,27 @@ /area/exoplanet/adhomai) "s" = ( /obj/structure/pit/landmine/hidden, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "u" = ( /obj/structure/adhomai_minefield, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "A" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "C" = ( /obj/structure/flora/rock/ice, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/structure/pit/landmine, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm index d936ca54854..fba5e188457 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dm @@ -16,3 +16,4 @@ base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC + area_blurb = "Countless warnings are stamped on the walls in multiple language, amounting to \"This place is not a place of honor. No highly esteemed deed is commemorated here. Nothing valued is here.\"" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dmm index 5f3c2c27f67..46977672d86 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste.dmm @@ -3,9 +3,7 @@ /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "b" = ( /obj/machinery/light, @@ -14,9 +12,7 @@ }, /area/adhomai_nuclear_waste) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "d" = ( /obj/machinery/door/airlock/highsecurity{ @@ -57,9 +53,7 @@ /obj/structure/sign/radiation{ pixel_y = 32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "i" = ( /obj/effect/decal/cleanable/greenglow/radioactive, @@ -72,17 +66,13 @@ dir = 4; status = 2 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "l" = ( /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "p" = ( /obj/effect/decal/cleanable/greenglow/radioactive, @@ -112,9 +102,7 @@ id = "radiation_waste"; dir = 2 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "t" = ( /obj/machinery/porta_turret/ballistic, @@ -131,17 +119,13 @@ pixel_y = -32 }, /obj/machinery/light, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "v" = ( /obj/structure/sign/radiation{ pixel_y = -32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "A" = ( /obj/machinery/light{ @@ -163,7 +147,6 @@ req_access = list(209); name = "Entry"; locked = 1; - icon_state = "door_locked"; dir = 1 }, /turf/simulated/floor/tiled/rust{ @@ -184,9 +167,7 @@ /area/adhomai_nuclear_waste) "G" = ( /obj/machinery/light, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "H" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -200,9 +181,7 @@ /turf/simulated/wall/r_wall, /area/adhomai_nuclear_waste) "J" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "L" = ( /obj/structure/closet/radiation, @@ -219,9 +198,7 @@ /obj/structure/blocker/steel/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "S" = ( /obj/machinery/porta_turret/ballistic, @@ -274,9 +251,7 @@ /obj/structure/sign/radiation{ pixel_y = -32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) "X" = ( /obj/effect/decal/cleanable/greenglow/radioactive, @@ -289,9 +264,7 @@ /area/adhomai_nuclear_waste) "Y" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_nuclear_waste) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm index 74f401440d1..ff030a0cf6e 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dm @@ -15,3 +15,4 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "This area is devoid of any life. Only your steps can be heard here." diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm index 4cd687a3529..9e855112d96 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_nuclear_waste_makeshift.dmm @@ -1,19 +1,17 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "b" = ( -/obj/structure/simple_door/wood{ - initial_lock_value = "dpra_nuclear_shack" - }, /obj/structure/barricade/wooden{ - dir = 4; + dir = 4 + }, +/obj/machinery/door/urban{ + dir = 8 }, /turf/simulated/floor/wood{ temperature = 268.15 }, /area/adhomai_nuclear_waste_makeshift) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "e" = ( /obj/structure/reagent_dispensers/radioactive_waste, @@ -85,9 +83,7 @@ /area/adhomai_nuclear_waste_makeshift) "J" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "M" = ( /obj/structure/reagent_dispensers/radioactive_waste, @@ -95,9 +91,7 @@ /area/adhomai_nuclear_waste_makeshift) "O" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/structure/reagent_dispensers/radioactive_waste, @@ -109,9 +103,7 @@ /area/adhomai_nuclear_waste_makeshift) "Y" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dmm index 7d91e7ed982..3775420a346 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue.dmm @@ -43,9 +43,7 @@ /turf/simulated/floor/concrete, /area/exoplanet/adhomai) "N" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/effect/floor_decal/concrete/large{ diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dmm index fac79da22b7..b49a016bf7b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_president_hadii_statue_toppled.dmm @@ -43,9 +43,7 @@ /turf/simulated/floor/concrete, /area/exoplanet/adhomai) "N" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/effect/floor_decal/concrete/large{ diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm index fe1b6ab532e..37075cb7027 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_rafama_herd.dmm @@ -1,44 +1,30 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "f" = ( /mob/living/simple_animal/hostile/retaliate/rafama, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "n" = ( /mob/living/simple_animal/hostile/retaliate/rafama/male, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "E" = ( /mob/living/simple_animal/hostile/retaliate/rafama/baby, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "H" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm index 6166398b1c3..f3312fe6840 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dm @@ -12,3 +12,4 @@ icon_state = "bluenew" base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai ambience = AMBIENCE_OTHERWORLDLY + area_blurb = "The ambience here feels eerie. It's too quiet." diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm index f4c65238b5e..fe96ca137b4 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskara_ritual.dmm @@ -1,27 +1,19 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_raskara_ritual) "g" = ( /obj/item/material/shard, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_raskara_ritual) "o" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_raskara_ritual) "s" = ( /obj/item/trash/cigbutt, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_raskara_ritual) "u" = ( /obj/structure/cult/tome{ @@ -31,23 +23,17 @@ }, /obj/item/material/knife/raskariim, /obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_raskara_ritual) "J" = ( /obj/item/reagent_containers/food/drinks/bottle/treebark_firewater{ pixel_y = -3; pixel_x = 11 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_raskara_ritual) "T" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_raskara_ritual) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm index 6ded1d2ee3f..4653a481f61 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm @@ -19,6 +19,7 @@ area_flags = AREA_FLAG_RAD_SHIELDED turf_initializer = new /datum/turf_initializer/maintenance/raskariim() ambience = AMBIENCE_GHOSTLY + area_blurb = "You feel watched as you enter this old house." /datum/turf_initializer/maintenance/raskariim/initialize(var/turf/simulated/T) ..() diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm index 76bd0ac7462..1f56adaba01 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm @@ -10,9 +10,7 @@ }, /obj/structure/closet/outhouse, /obj/item/organ/internal/liver/tajara, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "bE" = ( /obj/structure/closet/crate/bin, @@ -45,9 +43,7 @@ /obj/structure/railing/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "cW" = ( /obj/effect/decal/fake_object{ @@ -59,27 +55,27 @@ }, /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) +"da" = ( +/obj/machinery/door/urban{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/wood, +/area/adhomai_raskariim_hideout) "de" = ( /obj/structure/railing/fence{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "dg" = ( /obj/item/stack/material/wood/log, /obj/item/stack/material/wood/log, /obj/item/stack/material/wood/log, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "ds" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "ez" = ( /obj/structure/table/wood, @@ -95,12 +91,8 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "fs" = ( -/obj/structure/curtain/black, /obj/structure/barricade/wooden{ - dir = 4 - }, -/obj/structure/window/basic{ - dir = 4 + dir = 8 }, /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) @@ -204,7 +196,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "ri" = ( -/obj/structure/simple_door/wood, +/obj/machinery/door/urban, /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "rw" = ( @@ -220,12 +212,8 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "rG" = ( -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/curtain/black, -/obj/structure/barricade/wooden{ - dir = 8 +/obj/machinery/door/urban{ + dir = 4 }, /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) @@ -260,9 +248,7 @@ dir = 8 }, /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "uQ" = ( /obj/machinery/light/small, @@ -273,9 +259,7 @@ /obj/structure/railing/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "vA" = ( /obj/item/surgery/scalpel, @@ -403,6 +387,10 @@ /obj/item/material/kitchen/utensil/knife, /turf/simulated/floor/exoplanet/concrete, /area/adhomai_raskariim_hideout) +"yF" = ( +/obj/structure/sign/flag/raskara, +/turf/simulated/floor/exoplanet/wood, +/area/adhomai_raskariim_hideout) "zd" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp{ @@ -425,17 +413,13 @@ dir = 1 }, /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "CS" = ( /obj/structure/railing/fence{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Dg" = ( /obj/structure/reagent_dispensers/keg/mead, @@ -446,9 +430,7 @@ dir = 1 }, /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Dl" = ( /obj/item/tape_roll{ @@ -535,14 +517,15 @@ /obj/item/clothing/head/tajaran/raskara, /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) +"Ja" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/wood, +/area/adhomai_raskariim_hideout) "Jk" = ( /obj/structure/curtain/black, -/obj/structure/barricade/wooden{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 1 - }, +/obj/effect/map_effect/window_spawner/full/wood, /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "Jq" = ( @@ -581,9 +564,7 @@ /area/adhomai_raskariim_hideout) "Mo" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "MY" = ( /obj/structure/railing/fence{ @@ -592,15 +573,11 @@ /obj/structure/railing/fence{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "MZ" = ( /obj/structure/railing/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Nl" = ( /obj/item/reagent_containers/inhaler/raskara_dust{ @@ -655,24 +632,22 @@ /area/adhomai_raskariim_hideout) "PT" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Ru" = ( /obj/structure/railing/fence, /obj/structure/railing/fence{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "SE" = ( /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "Te" = ( -/obj/item/trash/can/adhomian_can, +/obj/structure/barricade/wooden{ + dir = 1 + }, /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "UC" = ( @@ -695,9 +670,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_raskariim_hideout) "WM" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "WO" = ( /turf/simulated/wall/wood, @@ -720,6 +693,9 @@ /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/reagent_containers/food/snacks/meat/adhomai, /obj/item/organ/internal/liver/tajara, +/obj/structure/barricade/wooden{ + dir = 4 + }, /turf/simulated/floor/exoplanet/concrete, /area/adhomai_raskariim_hideout) @@ -728,7 +704,7 @@ WO WO WO WO -rG +Jk WO WO de @@ -752,7 +728,7 @@ WO Vm Nt Dg -SE +fs Pz WO WM @@ -781,14 +757,14 @@ NT WO WO WO -rG +Jk WO WO WO WO WO -rG -rG +Jk +Jk WO WO WM @@ -805,14 +781,14 @@ SE SE HE WO -SE +fs tv LC rK WO rg -SE -SE +fs +fs HG WO WM @@ -849,7 +825,7 @@ WM WO WO WO -ri +rG WO WO WO @@ -871,10 +847,10 @@ MZ CS WM WO +yF DU SE SE -SE Ml WO zC @@ -1017,7 +993,7 @@ WM WO WO WO -ri +rG WO WO WO @@ -1048,10 +1024,10 @@ WO WO WO WO -ri +da WO WO -ri +da WO WO WO @@ -1140,13 +1116,13 @@ wq kt kt lI -SE +Ja sX WO WO WO WO -fs +Jk WO WO WO @@ -1164,7 +1140,7 @@ WO WO WO WO -fs +Jk WO WO WM diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm index 56ff1b6ef38..7a9030a3018 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_rredouane_shrine.dmm @@ -1,9 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "o" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "s" = ( /obj/item/flame/candle{ @@ -26,47 +24,41 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/mug{ pixel_y = -5 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 +/obj/item/storage/altar/rredouane{ + pixel_y = 15 }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "u" = ( /obj/structure/rredouane_statue, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, +/area/exoplanet/adhomai) +"G" = ( +/obj/structure/sign/flag/rredouane, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "J" = ( /obj/item/storage/pill_bottle/dice/tajara{ pixel_x = 10; - pixel_y = -5 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = -10 }, +/obj/structure/sign/flag/rredouane, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "K" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "N" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/structure/flora/rock/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "T" = ( /obj/item/deck/cards{ @@ -77,9 +69,7 @@ pixel_y = 10; pixel_x = -3 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" @@ -122,7 +112,7 @@ N N N N -N +G T N N diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm index ed985ccdb04..863c177e73b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dm @@ -15,3 +15,4 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "The sounds of animals and machines can be heard in this installation." diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm index 794fdd42502..a0f10f67d1a 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_schlorrgo_cage.dmm @@ -35,9 +35,7 @@ /obj/structure/blocker/steel/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "g" = ( /obj/effect/floor_decal/concrete{ @@ -59,9 +57,7 @@ /obj/structure/sign/biohazard{ pixel_y = -32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "i" = ( /obj/effect/floor_decal/concrete{ @@ -85,15 +81,11 @@ pixel_y = 5; pixel_x = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "l" = ( /obj/machinery/light, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "m" = ( /obj/effect/floor_decal/concrete{ @@ -189,9 +181,7 @@ /mob/living/simple_animal/schlorrgo{ dead_on_map = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "A" = ( /obj/effect/floor_decal/concrete/large{ @@ -271,14 +261,10 @@ /area/adhomai_schlorrgo_cage) "N" = ( /obj/structure/pit, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "O" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "P" = ( /obj/effect/floor_decal/concrete/large{ @@ -364,9 +350,7 @@ /area/adhomai_schlorrgo_cage) "Y" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_schlorrgo_cage) "Z" = ( /obj/effect/floor_decal/concrete{ diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm index 822e5926313..f1476ea2ca3 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dm @@ -17,6 +17,7 @@ base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC + area_blurb = "The closed doors on the ground ominously point to the sky." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm index e66a697ce8d..219ebd263f3 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_silo.dmm @@ -12,9 +12,7 @@ /turf/simulated/floor/concrete, /area/adhomai_silo) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "d" = ( /obj/effect/floor_decal/concrete{ @@ -100,9 +98,7 @@ /obj/structure/blocker/steel/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_silo) "t" = ( /obj/machinery/light{ @@ -277,9 +273,7 @@ /area/adhomai_silo) "Y" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_silo) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dmm index 22a38c44f12..1ac0f967020 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_sole_rock_nomad.dmm @@ -1,48 +1,34 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "m" = ( /obj/effect/ghostspawpoint{ identifier = "adhomai_sole_rock_nomad"; name = "igs - adhomai_sole_rock_nomad" }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "z" = ( /obj/item/stack/medical/bruise_pack/full, /obj/item/stack/medical/bruise_pack/full, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "M" = ( /obj/vehicle/animal/climber, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "P" = ( /obj/structure/bonfire/light_up, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm index 5de74f2f391..15eff562750 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_tunneler_nest.dmm @@ -1,56 +1,38 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "j" = ( /mob/living/simple_animal/ice_tunneler/baby, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "k" = ( /mob/living/simple_animal/ice_tunneler, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "q" = ( /obj/structure/ice_tunneler_nest, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "C" = ( /obj/structure/flora/rock/ice, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "H" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "S" = ( /mob/living/simple_animal/ice_tunneler/male, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm index 4284a37ce84..12d64c249e9 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dm @@ -17,6 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "A cozy Tajaran village. The heat and smell of food emanating from the houses may be a relief from the cold wilderness." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index 7343f36ca0f..471b1d5d88b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -83,9 +83,7 @@ /area/adhomai_village) "fD" = ( /obj/structure/closet/outhouse, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_village) "fZ" = ( /obj/structure/bed/stool/chair/wood{ @@ -182,11 +180,6 @@ }, /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) -"kO" = ( -/obj/structure/window/basic, -/obj/structure/curtain/black, -/turf/simulated/floor/exoplanet/wood, -/area/adhomai_village) "mf" = ( /obj/structure/closet/cabinet, /obj/item/ammo_casing/shotgun/pellet, @@ -230,9 +223,7 @@ /area/adhomai_village) "oi" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_village) "ol" = ( /obj/structure/table/wood, @@ -283,7 +274,7 @@ }, /area/adhomai_village) "rf" = ( -/obj/structure/simple_door/wood, +/obj/machinery/door/urban, /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "rM" = ( @@ -377,9 +368,7 @@ }, /area/adhomai_village) "xc" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_village) "xn" = ( /obj/structure/bed/stool/chair/wood{ @@ -416,10 +405,8 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "zh" = ( -/obj/structure/window/basic{ - dir = 1 - }, /obj/structure/curtain/black, +/obj/effect/map_effect/window_spawner/full/wood, /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "zA" = ( @@ -493,9 +480,7 @@ /area/adhomai_village) "Fz" = ( /obj/structure/sink/puddle, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_village) "FM" = ( /obj/structure/bed/stool/wood, @@ -616,9 +601,7 @@ /obj/structure/railing/fence{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_village) "Jb" = ( /turf/simulated/floor/exoplanet/barren{ @@ -826,8 +809,7 @@ /turf/simulated/floor/exoplanet/wood, /area/adhomai_village) "TD" = ( -/obj/structure/curtain/black, -/obj/structure/window/basic{ +/obj/machinery/door/urban{ dir = 4 }, /turf/simulated/floor/exoplanet/wood, @@ -900,9 +882,7 @@ /area/adhomai_village) "YV" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/adhomai_village) "Zi" = ( /obj/structure/railing/fence{ @@ -993,7 +973,7 @@ HX TQ TQ Ic -kO +zh IM ew xc @@ -1038,7 +1018,7 @@ Gu GN TQ Cc -kO +zh xc xc xc @@ -1264,7 +1244,7 @@ Gu Gu Gu Gu -rf +TD Gu YV xc @@ -1311,7 +1291,7 @@ Gu Gu Gu Gu -TD +zh Gu Jb xc @@ -1333,7 +1313,7 @@ TQ TQ TQ TQ -kO +zh xc xc xc @@ -1610,7 +1590,7 @@ Gu Gu Gu Gu -rf +TD Gu Gu wj @@ -1696,7 +1676,7 @@ Gu Gu Gu Gu -rf +TD Gu Gu "} @@ -1852,7 +1832,7 @@ TQ TQ TQ TQ -kO +zh xc xc xc @@ -1947,7 +1927,7 @@ Gu Gu Gu Gu -TD +zh Gu Gu Gu diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm index a9011f74ef4..bdde7092be7 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_war_memorial.dmm @@ -38,9 +38,7 @@ /turf/simulated/floor/concrete/square, /area/exoplanet/adhomai) "w" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "x" = ( /obj/structure/railing/mapped{ diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dm b/maps/random_ruins/exoplanets/adhomai/ala_base.dm index bc20e8caddd..99e1d0d8d35 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dm @@ -17,6 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "A Liberation Army outpost. The smell of alcohol mixed with gunpowder welcomes you." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm index d3ab3ae9c98..9bb8eb61efb 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm @@ -3,9 +3,7 @@ /obj/structure/barricade/metal/wired{ pixel_y = 16 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "ak" = ( /obj/structure/railing/fence{ @@ -77,8 +75,10 @@ /turf/simulated/floor/exoplanet/wood, /area/ala_base) "dg" = ( -/obj/structure/sign/flag/dpra/large/east, -/turf/simulated/wall/iron, +/obj/structure/sign/flag/dpra/large/east{ + pixel_x = 32 + }, +/turf/simulated/floor/exoplanet/wood, /area/ala_base) "dF" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -162,14 +162,14 @@ /turf/simulated/floor/exoplanet/wood, /area/ala_base) "gW" = ( -/obj/structure/sign/flag/dpra/large/north, +/obj/structure/sign/flag/dpra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/exoplanet/wood, /area/ala_base) "hT" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "iM" = ( /obj/structure/closet/crate/bin, @@ -177,11 +177,10 @@ /area/ala_base) "iP" = ( /obj/structure/sign/flag/dpra{ - pixel_x = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_x = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "iY" = ( /obj/effect/floor_decal/industrial/loading/yellow{ @@ -191,9 +190,7 @@ /area/ala_base) "jH" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "lr" = ( /obj/structure/bed/stool/chair/wood{ @@ -247,9 +244,7 @@ dir = 4 }, /obj/structure/railing/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "ne" = ( /obj/structure/bed/padded, @@ -261,9 +256,7 @@ /obj/structure/curtain/black{ pixel_y = 32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "nE" = ( /obj/structure/simple_door/wood, @@ -273,9 +266,7 @@ /obj/structure/closet/crate/bin{ pixel_y = 24 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "om" = ( /turf/simulated/floor/exoplanet/tiled/dark, @@ -313,9 +304,7 @@ name = "water heater"; desc = "A rustic Adhomian heater typically filled with firewood This one is connected to a nearby water tank. Warm enough to gather around the winter." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "qm" = ( /obj/structure/bed, @@ -352,9 +341,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "sD" = ( /obj/effect/decal/cleanable/blood/drip, @@ -406,9 +393,7 @@ /area/ala_base) "ut" = ( /obj/machinery/light, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "uw" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -458,9 +443,7 @@ /turf/simulated/floor/exoplanet/tiled/dark, /area/ala_base) "vi" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "vy" = ( /obj/structure/railing/fence{ @@ -516,11 +499,10 @@ "wf" = ( /obj/machinery/light, /obj/structure/sign/flag/dpra{ - pixel_y = -33 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = -33; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "wB" = ( /obj/structure/bed/padded, @@ -547,9 +529,13 @@ /obj/structure/closet/crate/bin{ name = "fire wood bin" }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 +/turf/simulated/floor/exoplanet/snow/cold, +/area/ala_base) +"xl" = ( +/obj/machinery/door/urban{ + dir = 4 }, +/turf/simulated/floor/exoplanet/wood, /area/ala_base) "xp" = ( /obj/structure/railing/fence, @@ -589,9 +575,7 @@ /area/ala_base) "yB" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "yE" = ( /obj/machinery/washing_machine, @@ -676,9 +660,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "Av" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -702,9 +684,7 @@ name = "heated water tank"; desc = "A tank of water filed by melting local snow." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "Bg" = ( /obj/machinery/light/small{ @@ -747,15 +727,11 @@ dir = 4; status = 2 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "Cs" = ( /obj/structure/closet/crate/bin, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "CW" = ( /obj/structure/railing/fence{ @@ -764,9 +740,7 @@ /turf/simulated/floor/exoplanet/wood, /area/ala_base) "DB" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "DG" = ( /obj/machinery/light, @@ -841,9 +815,7 @@ /obj/structure/blocker/steel/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "ES" = ( /obj/structure/bed/padded, @@ -916,9 +888,7 @@ /obj/item/pipe{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "KB" = ( /obj/structure/bedsheetbin{ @@ -936,7 +906,9 @@ "KV" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, -/obj/structure/sign/flag/dpra/large/north, +/obj/structure/sign/flag/dpra/large/north{ + pixel_y = 32 + }, /obj/effect/ghostspawpoint{ identifier = "ala_base_soldier"; name = "igs - ala_base_soldier" @@ -1034,18 +1006,14 @@ desc = "A green sign which showcases the location of a medical aid station."; pixel_x = 32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "Ol" = ( /obj/structure/table/rack, /obj/item/shovel, /obj/item/shovel, /obj/item/shovel, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "OG" = ( /obj/machinery/light, @@ -1074,18 +1042,14 @@ /area/ala_base) "Pi" = ( /obj/structure/closet/outhouse, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "PC" = ( /obj/machinery/light{ dir = 8 }, /obj/structure/closet/crate/bin, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "PY" = ( /obj/structure/table/steel, @@ -1105,20 +1069,17 @@ /area/ala_base) "RD" = ( /obj/structure/sign/flag/dpra{ - pixel_y = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Sc" = ( /obj/item/reagent_containers/glass/bucket/wood{ pixel_x = 11; pixel_y = -11 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "Sr" = ( /obj/structure/railing/fence, @@ -1148,25 +1109,19 @@ /obj/machinery/floodlight{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "TB" = ( /obj/structure/light_pole/r{ density = 0 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "Vc" = ( /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/ala_base) "VN" = ( /obj/structure/noticeboard{ @@ -1187,9 +1142,7 @@ name = "woodcutting axe"; desc = "A short lightweight tool meant to chop, pry and pierce wood." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "XN" = ( /obj/structure/curtain/black{ @@ -1222,9 +1175,7 @@ /area/ala_base) "ZQ" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" @@ -1884,7 +1835,7 @@ DB DB Hq uI -zp +dg ES Hq DB @@ -1923,7 +1874,7 @@ DB DB Hq Hq -dg +Hq Hq Hq DB @@ -2135,7 +2086,7 @@ DB DB yS yS -nE +xl yS yS DB diff --git a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm index 50e9ecbb4c9..692f57c3b3b 100644 --- a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm +++ b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm @@ -8,9 +8,7 @@ /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "c" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "h" = ( /obj/item/material/caltrops, @@ -50,9 +48,7 @@ /area/exoplanet/adhomai) "s" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "u" = ( /obj/structure/closet/crate/weapon/alt, @@ -69,9 +65,7 @@ /area/exoplanet/adhomai) "x" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "A" = ( /obj/item/landmine{ @@ -89,7 +83,9 @@ /area/exoplanet/adhomai) "C" = ( /obj/structure/reagent_dispensers/keg/mead, -/obj/structure/sign/flag/dpra/large/north, +/obj/structure/sign/flag/dpra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "F" = ( @@ -110,12 +106,15 @@ /obj/item/pickaxe, /obj/item/pickaxe, /obj/item/pickaxe, -/obj/structure/sign/flag/dpra/large/north, +/obj/structure/sign/flag/dpra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) "J" = ( /obj/structure/sign/flag/dpra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/exoplanet/mineral/adhomai, /area/exoplanet/adhomai) @@ -171,9 +170,7 @@ /area/exoplanet/adhomai) "X" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) (1,1,1) = {" diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dm b/maps/random_ruins/exoplanets/adhomai/nka_base.dm index 4d98b02ac4e..db3197a68f6 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dm @@ -17,7 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED - + area_blurb = "A Royal Army outpost. The installations appear to be precarious." //ghostroles diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm index b76f2594193..6b2036dc14d 100644 --- a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm @@ -21,9 +21,7 @@ pixel_x = 11; pixel_y = -11 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "bR" = ( /obj/machinery/light/small{ @@ -44,6 +42,10 @@ }, /turf/simulated/floor/exoplanet/tiled, /area/nka_base) +"eh" = ( +/obj/machinery/door/urban, +/turf/simulated/floor/exoplanet/wood, +/area/nka_base) "eF" = ( /obj/structure/sign/emergency/meetingpoint{ name = "\improper AID STATION sign"; @@ -64,9 +66,7 @@ /obj/structure/sign/flag/nka{ pixel_x = -32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "gF" = ( /obj/structure/bed/stool/chair/wood, @@ -79,9 +79,7 @@ /obj/structure/blocker/steel/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "hK" = ( /obj/item/stack/material/wood/log/full, @@ -90,32 +88,24 @@ /obj/structure/closet/crate/bin{ name = "fire wood bin" }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "hT" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "ji" = ( /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "jN" = ( /obj/structure/table/rack, /obj/item/shovel, /obj/item/shovel, /obj/item/shovel, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "ka" = ( /obj/structure/bed/padded, @@ -133,9 +123,7 @@ /area/nka_base) "lX" = ( /obj/machinery/light/small, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "mf" = ( /obj/structure/closet/secure_closet/cabinet{ @@ -201,9 +189,7 @@ /obj/structure/table/rack, /obj/item/wrench, /obj/item/screwdriver, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "pB" = ( /obj/structure/closet/cabinet, @@ -215,9 +201,7 @@ /area/nka_base) "pV" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "qa" = ( /obj/structure/reagent_dispensers/keg/mead, @@ -232,9 +216,7 @@ name = "water tank"; desc = "A tank of water filed by melting local snow." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "rV" = ( /obj/machinery/light/small{ @@ -290,9 +272,7 @@ /turf/simulated/floor/exoplanet/wood, /area/nka_base) "vi" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "vl" = ( /obj/item/reagent_containers/glass/bucket/wood{ @@ -329,9 +309,7 @@ /area/nka_base) "wy" = ( /obj/structure/bonfire, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "wB" = ( /obj/machinery/light/small{ @@ -340,9 +318,7 @@ /obj/structure/sign/flag/nka{ pixel_x = 32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "wC" = ( /obj/structure/closet/secure_closet/cabinet{ @@ -387,6 +363,12 @@ }, /turf/simulated/floor/exoplanet/tiled, /area/nka_base) +"xQ" = ( +/obj/machinery/door/urban{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/wood, +/area/nka_base) "yk" = ( /obj/machinery/shower{ dir = 1 @@ -403,9 +385,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "yB" = ( /turf/simulated/wall/wood, @@ -487,9 +467,7 @@ /turf/simulated/floor/exoplanet/tiled, /area/nka_base) "DL" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "Ec" = ( /obj/structure/closet/cabinet, @@ -532,9 +510,7 @@ /area/nka_base) "EK" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "EP" = ( /turf/simulated/floor/exoplanet/barren{ @@ -551,9 +527,7 @@ /area/nka_base) "IG" = ( /obj/structure/closet/outhouse, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "Jc" = ( /obj/structure/closet/cabinet, @@ -617,14 +591,18 @@ /turf/simulated/floor/exoplanet/wood, /area/nka_base) "Qx" = ( -/obj/structure/sign/flag/nka/large/south, +/obj/structure/sign/flag/nka/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/exoplanet/wood, /area/nka_base) "Rb" = ( /turf/simulated/floor/exoplanet/tiled, /area/nka_base) "Rg" = ( -/obj/effect/map_effect/window_spawner/basic, +/obj/structure/blocker/steel/fence{ + dir = 4 + }, /turf/simulated/floor/exoplanet/tiled, /area/nka_base) "Sr" = ( @@ -657,24 +635,22 @@ "Up" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, -/obj/structure/sign/flag/nka/large/north, +/obj/structure/sign/flag/nka/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/exoplanet/wood, /area/nka_base) "Uz" = ( /obj/item/torch, /obj/effect/decal/cleanable/ash, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/nka_base) "UX" = ( /obj/structure/bed/stool/bar/padded/brown, /turf/simulated/floor/exoplanet/wood, /area/nka_base) "Vn" = ( -/obj/structure/simple_door/wood{ - name = "shower" - }, +/obj/machinery/door/urban, /turf/simulated/floor/exoplanet/barren{ temperature = 268.15 }, @@ -725,7 +701,9 @@ /turf/simulated/floor/exoplanet/wood, /area/nka_base) "Yr" = ( -/obj/structure/sign/flag/nka/large/north, +/obj/structure/sign/flag/nka/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/exoplanet/wood, /area/nka_base) "Yv" = ( @@ -1149,7 +1127,7 @@ DL DL DL yB -WG +xQ yB yB yB @@ -1231,7 +1209,7 @@ yB DL EP EP -WG +eh mB mB vd @@ -1537,10 +1515,10 @@ DL DL EP EP -yB -yB -yB -yB +CO +CO +CO +CO DL gU "} @@ -1574,7 +1552,7 @@ Fo Rg gF YC -yB +CO DL gU "} @@ -1608,7 +1586,7 @@ EP cM Rb AC -yB +CO DL gU "} @@ -1639,10 +1617,10 @@ EP EP EP EP -yB +CO ak ka -yB +CO DL gU "} @@ -1673,10 +1651,10 @@ EP EP EP EP -yB -yB -yB -yB +CO +CO +CO +CO DL gU "} diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm index 0703052b914..20b8afb38e7 100644 --- a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm +++ b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm @@ -310,7 +310,7 @@ /turf/simulated/floor/exoplanet/carpet/rubber, /area/adhomai_archeology) "X" = ( -/turf/simulated/wall/cloth, +/turf/simulated/wall/wood, /area/adhomai_archeology) "Y" = ( /obj/machinery/artifact_scanpad, diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dm b/maps/random_ruins/exoplanets/adhomai/pra_base.dm index 559587faf6b..15bd597c768 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dm @@ -17,6 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "A Hadiist Army outpost. The People's Republic of Adhomai's anthem is blared from the speakers." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm index 4138174b6aa..62ec08d2293 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_base.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_base.dmm @@ -21,7 +21,8 @@ dir = 6 }, /obj/structure/sign/flag/pra{ - pixel_x = 32 + pixel_x = 32; + stand_icon = null }, /turf/simulated/floor/concrete{ temperature = 268.15 @@ -56,7 +57,8 @@ /area/pra_base) "bU" = ( /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /obj/effect/floor_decal/concrete{ dir = 10 @@ -140,13 +142,15 @@ }, /area/pra_base) "fY" = ( -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, /area/pra_base) "gh" = ( -/obj/effect/map_effect/window_spawner/reinforced/polarized{ +/obj/effect/map_effect/window_spawner/full/reinforced/polarized{ id = "pra_base" }, /turf/simulated/floor/wood, @@ -155,6 +159,12 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen/fountain/black, +/obj/machinery/button/switch/windowtint{ + dir = 4; + id = "pra_base"; + pixel_x = 10; + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/pra_base) "gP" = ( @@ -178,9 +188,7 @@ /area/pra_base) "hT" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "jE" = ( /obj/effect/floor_decal/concrete/large{ @@ -227,7 +235,9 @@ }, /area/pra_base) "ly" = ( -/obj/structure/sign/flag/pra/large/east, +/obj/structure/sign/flag/pra/large/east{ + pixel_x = 32 + }, /obj/structure/bed/stool/chair/wood{ dir = 8 }, @@ -235,6 +245,11 @@ identifier = "pra_base_commissar"; name = "igs - pra_base_commissar" }, +/obj/machinery/button/switch/windowtint{ + dir = 4; + pixel_x = -4; + id = "pra_base" + }, /turf/simulated/floor/wood, /area/pra_base) "lC" = ( @@ -304,11 +319,6 @@ temperature = 268.15 }, /area/pra_base) -"mB" = ( -/turf/simulated/floor/concrete/square{ - temperature = 268.15 - }, -/area/pra_base) "mN" = ( /obj/effect/floor_decal/concrete{ dir = 9 @@ -329,7 +339,8 @@ "nc" = ( /obj/structure/table/standard, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/concrete/square{ temperature = 268.15 @@ -353,9 +364,7 @@ /obj/structure/barricade/metal/wired{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "oO" = ( /obj/structure/closet/walllocker/medical{ @@ -506,16 +515,13 @@ "uO" = ( /obj/machinery/light, /obj/structure/sign/flag/pra{ - pixel_y = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "vi" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "vD" = ( /obj/structure/table/steel, @@ -529,9 +535,7 @@ pixel_y = -29 }, /obj/machinery/light, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "vQ" = ( /obj/effect/floor_decal/concrete{ @@ -543,9 +547,7 @@ }, /area/pra_base) "wB" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "wC" = ( /obj/machinery/vending/cigarette, @@ -692,13 +694,12 @@ /obj/structure/barricade/metal/wired{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "CG" = ( /obj/structure/sign/flag/pra{ - pixel_y = 30 + pixel_y = 30; + stand_icon = null }, /turf/simulated/floor/wood, /area/pra_base) @@ -845,7 +846,9 @@ "FZ" = ( /obj/structure/table/standard, /obj/item/device/flashlight/lamp, -/obj/structure/sign/flag/pra/large/south, +/obj/structure/sign/flag/pra/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, @@ -884,12 +887,12 @@ /area/exoplanet/adhomai) "If" = ( /obj/item/pipe, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Iq" = ( -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /obj/structure/hadii_statue, /turf/simulated/floor/concrete/square{ temperature = 268.15 @@ -901,22 +904,7 @@ /area/pra_base) "Jc" = ( /obj/machinery/light, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, -/area/pra_base) -"Jg" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/under/tajaran/pra_uniform, -/obj/item/clothing/suit/storage/tajaran/pra_jacket/armored, -/obj/item/clothing/head/beret/tajaran/pra, -/obj/item/clothing/accessory/holster/hip, -/obj/item/book/manual/pra_manifesto, -/obj/item/clothing/accessory/badge/pra_passport, -/turf/simulated/floor/concrete/square{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Jw" = ( /obj/structure/hadii_statue/stone, @@ -942,33 +930,28 @@ /area/pra_base) "JK" = ( /obj/structure/table/wood, -/obj/machinery/button/switch/windowtint{ - dir = 4; - pixel_x = -4; - pixel_y = 7; - id = "pra_base" - }, /obj/item/stamp{ name = "people's republic of adhomai stamp"; icon_state = "stamp-zavod"; - pixel_x = 6 + pixel_x = 10; + pixel_y = 12 }, /obj/item/stamp/denied{ - pixel_x = -4 + pixel_y = 12 }, +/obj/item/portable_typewriter, /turf/simulated/floor/wood, /area/pra_base) "Lb" = ( /obj/machinery/light, /obj/structure/sign/flag/pra{ - pixel_y = -32 + pixel_y = -32; + stand_icon = null }, /obj/machinery/floodlight{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Lm" = ( /obj/effect/floor_decal/concrete, @@ -985,9 +968,7 @@ name = "heated water tank"; desc = "A tank of water filed by melting local snow." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Lu" = ( /obj/effect/floor_decal/concrete{ @@ -999,9 +980,7 @@ /area/pra_base) "LI" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Md" = ( /turf/simulated/floor/tiled/freezer{ @@ -1108,11 +1087,10 @@ dir = 1 }, /obj/structure/sign/flag/pra{ - pixel_y = 32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = 32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Rd" = ( /obj/machinery/light/small{ @@ -1134,7 +1112,9 @@ /obj/item/clothing/accessory/holster/hip, /obj/item/book/manual/pra_manifesto, /obj/item/clothing/accessory/badge/pra_passport, -/obj/structure/sign/flag/pra/large/south, +/obj/structure/sign/flag/pra/large/south{ + pixel_y = -32 + }, /turf/simulated/floor/concrete/square{ temperature = 268.15 }, @@ -1144,9 +1124,7 @@ dir = 8; pixel_x = 10 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Se" = ( /turf/simulated/floor/tiled/white, @@ -1196,9 +1174,7 @@ name = "water heater"; desc = "A rustic Adhomian heater typically filled with firewood This one is connected to a nearby water tank. Warm enough to gather around the winter." }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_base) "Up" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -1993,7 +1969,7 @@ wB gU kO NW -Jg +aa gU wB gU @@ -2248,7 +2224,7 @@ wB wB wB gU -mB +NW EP ZR EJ diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm index cb1560fff43..0fc93b169b3 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm +++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dm @@ -17,6 +17,7 @@ no_light_control = FALSE base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED + area_blurb = "The sound of heavy machinery is heard around this camp." //ghostroles diff --git a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm index 27b1a81b9ae..c545445bdd4 100644 --- a/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm +++ b/maps/random_ruins/exoplanets/adhomai/pra_mining_camp.dmm @@ -2,7 +2,7 @@ "as" = ( /obj/machinery/conveyor{ dir = 8; - id = "pra_mining_base"; + id = "pra_mining_base" }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -24,7 +24,7 @@ /obj/structure/plasticflaps, /obj/effect/floor_decal/industrial/warning/cee, /obj/machinery/conveyor{ - id = "pra_mining_base"; + id = "pra_mining_base" }, /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) @@ -76,17 +76,13 @@ /area/pra_mining_camp) "hQ" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "iI" = ( /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_mining_camp) "jt" = ( /obj/structure/bed/stool/bar/padded/red, @@ -115,7 +111,7 @@ "om" = ( /obj/machinery/conveyor{ dir = 1; - id = "pra_mining_base"; + id = "pra_mining_base" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -140,11 +136,10 @@ /area/pra_mining_camp) "oR" = ( /obj/structure/sign/flag/nanotrasen{ - pixel_x = -32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_x = -32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "pa" = ( /obj/structure/bed/stool/bar/padded/red, @@ -170,7 +165,8 @@ /area/pra_mining_camp) "rM" = ( /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) @@ -194,7 +190,7 @@ "vd" = ( /obj/machinery/conveyor{ dir = 8; - id = "pra_mining_base"; + id = "pra_mining_base" }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -247,7 +243,7 @@ "Bx" = ( /obj/machinery/conveyor{ dir = 1; - id = "pra_mining_base"; + id = "pra_mining_base" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -272,9 +268,7 @@ /area/pra_mining_camp) "CC" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Fc" = ( /turf/simulated/wall/concrete, @@ -292,9 +286,7 @@ /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) "Hg" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Hq" = ( /obj/machinery/mineral/stacking_machine{ @@ -302,7 +294,7 @@ }, /obj/machinery/conveyor{ dir = 8; - id = "pra_mining_base"; + id = "pra_mining_base" }, /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -313,7 +305,7 @@ "Iy" = ( /obj/machinery/conveyor{ dir = 1; - id = "pra_mining_base"; + id = "pra_mining_base" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -376,7 +368,7 @@ /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/conveyor{ dir = 1; - id = "pra_mining_base"; + id = "pra_mining_base" }, /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) @@ -400,7 +392,7 @@ "NA" = ( /obj/machinery/conveyor{ dir = 1; - id = "pra_mining_base"; + id = "pra_mining_base" }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -420,9 +412,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_mining_camp) "PL" = ( /obj/structure/table/steel, @@ -434,17 +424,17 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/exoplanet/concrete, /area/pra_mining_camp) "PT" = ( /obj/structure/sign/flag/pra{ - pixel_x = 32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_x = 32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Qq" = ( /obj/structure/table/standard, @@ -486,17 +476,13 @@ /obj/structure/sign/flag/nanotrasen{ pixel_y = 32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "TJ" = ( /obj/structure/sign/flag/pra{ pixel_y = -32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "TS" = ( /obj/item/pickaxe, @@ -540,17 +526,14 @@ /area/pra_mining_camp) "WP" = ( /obj/structure/sign/flag/pra{ - pixel_y = 32 - }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 + pixel_y = 32; + stand_icon = null }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "WW" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "XU" = ( /obj/structure/table/standard, @@ -563,9 +546,7 @@ dir = 4; status = 2 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/pra_mining_camp) "ZG" = ( /obj/machinery/conveyor_switch/oneway{ diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm index d7164101a1f..6b480fa30c3 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dm @@ -18,6 +18,7 @@ base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai area_flags = AREA_FLAG_RAD_SHIELDED ambience = AMBIENCE_HIGHSEC + area_blurb = "You feel watched inside this ominous compound." //ghost roles diff --git a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm index 415dd13445e..4b55031cbd3 100644 --- a/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm +++ b/maps/random_ruins/exoplanets/adhomai/psis_outpost.dmm @@ -7,12 +7,6 @@ temperature = 268.15 }, /area/psis_outpost) -"as" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/reinforced{ - temperature = 268.15 - }, -/area/psis_outpost) "bE" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -80,10 +74,10 @@ "dP" = ( /obj/structure/table/standard, /obj/item/device/taperecorder, -/obj/item/device/camera, /obj/machinery/light/small/red{ dir = 1 }, +/obj/item/device/camera/adhomai, /turf/simulated/floor/reinforced{ temperature = 268.15 }, @@ -141,7 +135,8 @@ dir = 9 }, /obj/structure/sign/flag/pra{ - pixel_x = -32 + pixel_x = -32; + stand_icon = null }, /obj/machinery/papershredder, /turf/simulated/floor/tiled/dark{ @@ -182,9 +177,7 @@ /area/psis_outpost) "hQ" = ( /obj/structure/flora/tree/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "iI" = ( /obj/structure/table/standard, @@ -222,9 +215,7 @@ /obj/structure/sign/securearea{ pixel_y = 32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/psis_outpost) "jO" = ( /obj/structure/table/standard, @@ -232,7 +223,9 @@ /obj/item/folder/red, /obj/item/folder/red, /obj/item/folder/red, -/obj/structure/sign/flag/pra/large/south, +/obj/structure/sign/flag/pra/large/south{ + pixel_y = -32 + }, /obj/item/folder/red, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra{ pixel_y = 5; @@ -253,9 +246,7 @@ /obj/structure/sign/securearea{ pixel_y = -32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "lH" = ( /obj/structure/table/standard, @@ -264,7 +255,9 @@ }, /obj/item/paper_bin, /obj/item/pen/black, -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra{ pixel_x = 7; pixel_y = 2 @@ -291,15 +284,11 @@ /area/psis_outpost) "om" = ( /obj/machinery/light/small, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/psis_outpost) "on" = ( /obj/structure/blocker/steel/fence, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/psis_outpost) "oR" = ( /obj/structure/table/standard, @@ -313,7 +302,8 @@ dir = 8 }, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /obj/machinery/light{ dir = 8 @@ -332,9 +322,7 @@ /obj/structure/blocker/steel/fence{ dir = 4 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/psis_outpost) "qO" = ( /obj/effect/floor_decal/corner/black{ @@ -441,7 +429,8 @@ /area/psis_outpost) "yD" = ( /obj/structure/sign/flag/pra{ - pixel_x = -32 + pixel_x = -32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 268.15 @@ -513,9 +502,7 @@ /area/psis_outpost) "CC" = ( /obj/structure/flora/grass/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Fc" = ( /obj/structure/table/standard, @@ -558,9 +545,7 @@ }, /area/psis_outpost) "Hg" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Iy" = ( /obj/machinery/door/window/brigdoor{ @@ -596,7 +581,8 @@ dir = 10 }, /obj/structure/sign/flag/pra{ - pixel_y = -32 + pixel_y = -32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 268.15 @@ -637,9 +623,7 @@ }, /area/psis_outpost) "Kl" = ( -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/psis_outpost) "KF" = ( /obj/effect/floor_decal/corner/black/full, @@ -655,7 +639,8 @@ dir = 9 }, /obj/structure/sign/flag/pra{ - pixel_x = -32 + pixel_x = -32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 268.15 @@ -699,7 +684,8 @@ dir = 5 }, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /mob/living/simple_animal/hostile/commanded/dog/harron/cybernetic, /turf/simulated/floor/tiled/dark{ @@ -719,7 +705,7 @@ }, /area/psis_outpost) "NA" = ( -/obj/effect/map_effect/window_spawner/reinforced, +/obj/effect/map_effect/window_spawner/full/reinforced/grille, /obj/machinery/door/blast/regular/open{ id = "psis_cell" }, @@ -728,7 +714,9 @@ }, /area/psis_outpost) "OX" = ( -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/reinforced{ temperature = 268.15 }, @@ -738,7 +726,8 @@ dir = 5 }, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 268.15 @@ -777,7 +766,8 @@ dir = 1 }, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /obj/machinery/light{ dir = 4; @@ -817,9 +807,7 @@ /obj/structure/sign/securearea{ pixel_y = -32 }, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/psis_outpost) "Tn" = ( /turf/simulated/floor/tiled/dark{ @@ -832,7 +820,9 @@ dir = 8 }, /obj/item/device/flashlight/lamp, -/obj/structure/sign/flag/pra/large/north, +/obj/structure/sign/flag/pra/large/north{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark{ temperature = 268.15 }, @@ -890,7 +880,9 @@ }, /obj/item/paper_bin, /obj/item/pen/black, -/obj/structure/sign/flag/pra/large/south, +/obj/structure/sign/flag/pra/large/south{ + pixel_y = -32 + }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra{ pixel_x = -8; pixel_y = 5 @@ -930,9 +922,7 @@ /area/psis_outpost) "WW" = ( /obj/structure/flora/bush/adhomai, -/turf/simulated/floor/exoplanet/snow{ - temperature = 268.15 - }, +/turf/simulated/floor/exoplanet/snow/cold, /area/exoplanet/adhomai) "Xc" = ( /obj/structure/table/standard, @@ -1916,7 +1906,7 @@ Kl Kl Kl Mq -as +qx tu to qx diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm index a55a7e6a9b0..e2e4ece63c8 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm @@ -266,7 +266,8 @@ /obj/item/gun/projectile/shotgun/pump/rifle, /obj/item/gun/energy/rifle/icelance, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1571,7 +1572,8 @@ }, /obj/machinery/photocopier, /obj/structure/sign/flag/pra{ - pixel_y = -32 + pixel_y = -32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -1979,7 +1981,8 @@ dir = 1 }, /obj/structure/sign/flag/pra{ - pixel_y = -32 + pixel_y = -32; + stand_icon = null }, /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/pra, /turf/simulated/floor/tiled/dark{ @@ -2240,7 +2243,8 @@ icon_state = "4-8" }, /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -2642,8 +2646,8 @@ }, /area/raskara_okon/engineer) "JD" = ( +/obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/stargazer, -/obj/effect/floor_decal/corner_wide/black/diagonal, /turf/simulated/floor/tiled/dark{ temperature = 278.15 }, @@ -2774,7 +2778,8 @@ /area/raskara_okon/mining) "Lw" = ( /obj/structure/sign/flag/pra{ - pixel_y = 32 + pixel_y = 32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -3905,7 +3910,8 @@ dir = 10 }, /obj/structure/sign/flag/pra{ - pixel_y = -32 + pixel_y = -32; + stand_icon = null }, /turf/simulated/floor/tiled/dark{ temperature = 278.15 @@ -4450,8 +4456,8 @@ Xv Oc hj ga +Jb JD -Gn kr JM zB